summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-05-10 10:14:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-10 10:14:51 -0700
commitda7bf20608842c9607f5631a33f52561fec5f2b8 (patch)
tree8ef9916b2a8b76e23219fafa162381b4f4e4c2a5 /core/res
parent9d5b754bcec0fe526ff8bc8c7654f4b3106b6e2e (diff)
parentc8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4 (diff)
downloadframeworks_base-da7bf20608842c9607f5631a33f52561fec5f2b8.zip
frameworks_base-da7bf20608842c9607f5631a33f52561fec5f2b8.tar.gz
frameworks_base-da7bf20608842c9607f5631a33f52561fec5f2b8.tar.bz2
am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken * commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4': String change to refer to wifi tether as hotspot
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index a76c70c..86bfe94 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2257,7 +2257,7 @@
<!-- Strings for tethered notification -->
<!-- Shown when the device is tethered -->
- <string name="tethered_notification_title">Tethering active</string>
+ <string name="tethered_notification_title">Tethering or hotspot active</string>
<string name="tethered_notification_message">Touch to configure</string>
<!-- Strings for throttling notification -->