summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-12-10 06:59:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-10 06:59:02 -0800
commit8c98fc0a35bacdbac336bd787a62afc4f0efd6ba (patch)
tree88f5b40f073ecec8cff9d9f21506569b09d3819a /res
parentece711b124340401b123557334adde7bf48aa453 (diff)
parentaf03e5f0f32d56b831bdb2c849e32af796e49306 (diff)
downloadpackages_apps_settings-8c98fc0a35bacdbac336bd787a62afc4f0efd6ba.zip
packages_apps_settings-8c98fc0a35bacdbac336bd787a62afc4f0efd6ba.tar.gz
packages_apps_settings-8c98fc0a35bacdbac336bd787a62afc4f0efd6ba.tar.bz2
am af03e5f0: am 41eb3841: am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit 'af03e5f0f32d56b831bdb2c849e32af796e49306' * commit 'af03e5f0f32d56b831bdb2c849e32af796e49306': b/2296110 Dialog for setting up dock audio.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61e584a..113d32e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -641,8 +641,6 @@
<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>
- <!-- Bluetooth settings. Dock Setting Dialog - Hint for the user to chagne setting after checking "remember settings" -->
- <string name="bluetooth_dock_settings_hint">"Change with Settings under Sound &amp; display &gt; Dock audio</string>
<!-- Wi-Fi settings -->
<!-- Used in the 2nd-level settings screen to turn on Wi-Fi -->