diff options
| author | Michael Chan <mchan@android.com> | 2010-01-06 15:47:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-06 15:47:57 -0800 |
| commit | d638a7cb0841184349edbec2c995a36e5719cb8c (patch) | |
| tree | bf4a7fd25f29f1f7f502d0df11c467d806b0202f /res/values | |
| parent | 759f48ba1345a8827f217f8db3c71edfca1458c1 (diff) | |
| parent | 04e32ff35fe60cdd62509cff1df24d62cd464f4e (diff) | |
| download | packages_apps_settings-d638a7cb0841184349edbec2c995a36e5719cb8c.zip packages_apps_settings-d638a7cb0841184349edbec2c995a36e5719cb8c.tar.gz packages_apps_settings-d638a7cb0841184349edbec2c995a36e5719cb8c.tar.bz2 | |
am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 355cefb..a32a3ee 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -650,7 +650,7 @@ <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone --> <string name="bluetooth_dock_settings_headset">As speaker phone</string> <!-- 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 --> <string name="bluetooth_dock_settings_remember">Remember settings</string> |