am d5dc8b35: am 8c5140c0: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev

* commit 'd5dc8b3567d22fa2c10282ae95bf2653087299b9':
  Material theme updates for Bluetooth Device picker.
This commit is contained in:
PauloftheWest
2014-09-04 18:25:05 +00:00
committed by Android Git Automerger
4 changed files with 32 additions and 34 deletions

View File

@@ -315,8 +315,8 @@
<!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
<string name="bluetooth_show_received_files">Show received files</string>
<!-- Strings for BluetoothDevicePicker -->
<string name="device_picker">Bluetooth device chooser</string>
<!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
<string name="device_picker">Choose Bluetooth device</string>
<!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
<string name="bluetooth_permission_request">"Bluetooth permission request"</string>