commit 8c95e9be3873a283a4fb998283d2756dcb1eca2b
author Myles Watson <mylesgw@google.com> Fri Sep 22 18:06:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 22 18:06:47 2017 +0000
tree 71da9fb7ed752b20fe5198cee6e7c601d9194786
parent 5e91f05167d9a9eebe2c9445ccc8f8f5b200640a
parent 898bc388605bf8424770bac8170a77d1cec4de8d

Merge changes from topic "avrcp_cherry_picks" am: b4e17814f0
am: 898bc38860

Change-Id: Iee7beb952d58e7c117fa2fc50537988c7ad8b443

packages/SettingsLib/res/values/arrays.xml

diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index 1f1b67e..9704bd6 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -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>