summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Nordqvist <jannq@google.com>2015-08-04 01:42:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-04 01:42:39 +0000
commite334f5a7b4cac12f778690ef50e5f13ed7a702c8 (patch)
tree9ebc5e311eed496370936cc8dffbcc3aefe37a39
parent353dd0cd03ca11e928531f8764c2a9529ffceb5b (diff)
parent5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4 (diff)
downloadandroid_packages_apps_CertInstaller-e334f5a7b4cac12f778690ef50e5f13ed7a702c8.tar.gz
android_packages_apps_CertInstaller-e334f5a7b4cac12f778690ef50e5f13ed7a702c8.tar.bz2
android_packages_apps_CertInstaller-e334f5a7b4cac12f778690ef50e5f13ed7a702c8.zip
am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-dev
* commit '5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4': Added "Installing" string.
-rw-r--r--res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index de3a0a8..8550395 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,6 +90,7 @@
<string name="wifi_detail_title">Details for %s</string>
<string name="wifi_detail_label">Details</string>
<string name="wifi_install_label">Install</string>
+ <string name="wifi_installing_label">Installing</string>
<string name="wifi_cancel_label">Cancel</string>
<string name="wifi_dismiss_label">Dismiss</string>
<string name="wifi_no_config">None</string>