summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2009-10-29 19:27:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 19:27:12 -0700
commita8a974bd171ccbc3b35b18c3e73a23d22834d05e (patch)
tree66b4302a8103e0ba9d25addbb51df78a60633793 /res
parent7bb19a892cdf94d017a2046b374f977d47d20597 (diff)
parentdd45a47bde9cdb9c27cb3ac3529a34f9789782ec (diff)
downloadpackages_apps_settings-a8a974bd171ccbc3b35b18c3e73a23d22834d05e.zip
packages_apps_settings-a8a974bd171ccbc3b35b18c3e73a23d22834d05e.tar.gz
packages_apps_settings-a8a974bd171ccbc3b35b18c3e73a23d22834d05e.tar.bz2
am dd45a47b: Merge change I4d31288f into eclair
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2 * commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec': Fix for 1974140. Delete entry if not valid on hitting home.
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9475346..08d6e1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2129,4 +2129,7 @@ found in the list of installed applications.</string>
<string name="backup_erase_dialog_title">Settings backup</string>
<!-- Dialog title for confirmation to erase backup data from server -->
<string name="backup_erase_dialog_message">Are you sure you want to stop backing up your settings and erase all copies on Google servers?</string>
+
+ <!-- Name to assign to a Network Access Point that was saved without a name -->
+ <string name="untitled_apn">Untitled</string>
</resources>