Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair

This commit is contained in:
Michael Chan
2010-01-06 15:44:30 -08:00
committed by Android (Google) Code Review

View File

@@ -650,7 +650,7 @@
<!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone --> <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
<string name="bluetooth_dock_settings_headset">As speaker phone</string> <string name="bluetooth_dock_settings_headset">As speaker phone</string>
<!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 2: Use dock for media audio --> <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
<string name="bluetooth_dock_settings_a2dp">Music, ringer, alarms \u0028silences phone\u0029</string> <string name="bluetooth_dock_settings_a2dp">For music and media</string>
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again --> <!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
<string name="bluetooth_dock_settings_remember">Remember settings</string> <string name="bluetooth_dock_settings_remember">Remember settings</string>