summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-04-11 18:48:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 18:48:17 +0000
commit2396e29d31c79a600d564d84b0e6e26b0adff4e1 (patch)
tree73728bcfa220e63242d93d3422804c97e72bd914 /packages
parent761f7f0c9ee8052ae1ea0e242a6481116792d4f5 (diff)
parentae3f7cca5235b9c3da080e7f8210a21ecf48285b (diff)
downloadframeworks_base-2396e29d31c79a600d564d84b0e6e26b0adff4e1.zip
frameworks_base-2396e29d31c79a600d564d84b0e6e26b0adff4e1.tar.gz
frameworks_base-2396e29d31c79a600d564d84b0e6e26b0adff4e1.tar.bz2
am ae3f7cca: Merge "Add app_name to keyguard package."
* commit 'ae3f7cca5235b9c3da080e7f8210a21ecf48285b': Add app_name to keyguard package.
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml
index 4738049..d20b269 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -18,6 +18,8 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- App label in the manifest -->
+ <string name="app_name">Keyguard</string>
<!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
Displayed in one line in a large font. -->
<string name="keyguard_password_enter_pin_code">Type PIN code</string>