commit 4b2209e9efad80e42969507874fec98ce96669ad
author Jim Miller <jaggies@google.com> Mon Apr 12 17:55:56 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 12 17:55:56 2010 -0700
tree 443bc1df0cfa6ceccc705228576a775095fc46d5
parent ac8398a9d7c32bc738cc82c5a261a3bf0620adfd
parent 91523d601a6569ce9295a5617ca92a24582ff502

am 91523d60: Fix 2579923: Update language to make consistent with related feature.

Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken

* commit '91523d601a6569ce9295a5617ca92a24582ff502':
  Fix 2579923: Update language to make consistent with related feature.

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 633e9a8..5c33ae5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -568,7 +568,7 @@
     <string name="unlock_set_unlock_password_summary">Enter a password to unlock screen</string>
 
     <!-- Summary for preference that has been disabled by DevicePolicyAdmin -->
-    <string name="unlock_set_unlock_disabled_summary">Disable by device policy</string>
+    <string name="unlock_set_unlock_disabled_summary">Disabled by remote phone administrator</string>
 
 
     <!-- Title for option to turn of password/pin/pattern unlock. -->