Merge changes from topic "avrcp_cherry_picks"

am: b4e17814f0

Change-Id: Id15dddaeb7082031fdd03ca9e0f9f54c83abb142
This commit is contained in:
Myles Watson
2017-09-22 17:15:58 +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>