summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2010-11-09 17:32:09 -0800
committer Eric Fischer <enf@google.com> 2010-11-09 17:32:09 -0800
commit363eedcd65b81bbdbea64975f7fc366c6f9a1e0f (patch)
tree42da6371010a1b4bc22c2b4918d4231a6a5c5920
parent6362b3f077ab8e4662f499c32beb1006c3967f42 (diff)
Restore deleted string still referenced from AndroidManifest.
I think this must have been an accidental deletion since the comment is still there. Change-Id: I40bfa0f839efed19c073a0e9fc0b48b65d3eb293
-rwxr-xr-xcore/res/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 30503459bc22..3b01890b22b0 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1285,6 +1285,7 @@
with Near Field Communication (NFC) tags, cards, and readers.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+ <string name="permlab_disableKeyguard">disable keylock</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_disableKeyguard">Allows an application to disable
the keylock and any associated password security. A legitimate example of