Merge changes from topic "avrcp_cherry_picks" am: b4e17814f0

am: 898bc38860

Change-Id: Iee7beb952d58e7c117fa2fc50537988c7ad8b443
This commit is contained in:
Myles Watson
2017-09-22 18:06:47 +00:00
committed by android-build-merger

View File

@@ -105,6 +105,7 @@
<!-- Titles for Bluetooth AVRCP Versions -->
<string-array name="bluetooth_avrcp_versions">
<item>AVRCP 1.4 (Default)</item>
<item>AVRCP 1.3</item>
<item>AVRCP 1.5</item>
<item>AVRCP 1.6</item>
</string-array>
@@ -112,6 +113,7 @@
<!-- Values for Bluetooth AVRCP Versions -->
<string-array name="bluetooth_avrcp_version_values">
<item>avrcp14</item>
<item>avrcp13</item>
<item>avrcp15</item>
<item>avrcp16</item>
</string-array>