Merge "Enhance AVRCP Absolute Volume control implementation" am: b8a26db0b7

am: 6b82837c0f

* commit '6b82837c0facc5f3c343a00f407abd6ee2312496':
  Enhance AVRCP Absolute Volume control implementation

diff --cc res/values/config.xml
Simple merge

diff --cc src/com/android/bluetooth/avrcp/Avrcp.java
index 58c4459,7d14037..450574a
--- 1/src/com/android/bluetooth/avrcp/Avrcp.java
--- 2/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@@ -23,8 -24,11 +23,10 @@@ import android.bluetooth.BluetoothA2dp
  import android.bluetooth.BluetoothAvrcp;
  import android.content.Context;
  import android.content.Intent;
+ import android.content.res.Resources;
+ import android.content.SharedPreferences;
  import android.graphics.Bitmap;
  import android.media.AudioManager;
 -import android.media.IRemoteControlDisplay;
  import android.media.MediaMetadataRetriever;
  import android.media.RemoteControlClient;
  import android.media.RemoteController;