PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227
This commit is contained in:
pkanwar
2016-05-05 18:53:08 -07:00
parent b4e93c2a83 de67e0b0cd
commit 7fe0c25f77
2 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/values/strings.xml
View File

@@ -7551,4 +7551,24 @@
<!-- Estimated wait time range for real time supports -->
<string name="support_estimated_wait_time">~<xliff:g id="ESTIMATE" example="2 minutes">%1$s</xliff:g> wait</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_computer">Computer</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_headset">Headset</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_phone">Phone</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_imaging">Imaging</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_headphone">Headphone</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_input_peripheral">Input Peripheral</string>
<!-- Message for telling the user the kind of BT device being displayed in list. -->
<string name="bluetooth_talkback_bluetooth">Bluetooth</string>
</resources>