summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2009-12-07 20:50:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 20:50:32 -0800
commit41eb38412a0c1337ea4e61dcc4d35f82292ba0ae (patch)
tree26b24f295751e1fea2e13435fdc08865489ed3e5 /res
parente509c36f1ed3b33da223c2f7b54372b20421d317 (diff)
parent0c75b2d2dc35b88d5cb9db96afc72ed074ca5350 (diff)
downloadpackages_apps_settings-41eb38412a0c1337ea4e61dcc4d35f82292ba0ae.zip
packages_apps_settings-41eb38412a0c1337ea4e61dcc4d35f82292ba0ae.tar.gz
packages_apps_settings-41eb38412a0c1337ea4e61dcc4d35f82292ba0ae.tar.bz2
am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2 * commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350': 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 3c6264c..d0d1b5d 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 -->