commit 82f927bd28a1c57bce663771ccef77a7d515c9f7
author Sudheer Shanka <sudheersai@google.com> Fri Feb 19 18:15:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 19 18:15:33 2016 +0000
tree df11020d6c7bf579e21b41a0e64c2c80c7834182
parent 1d3c41e563c30d85d5524df598f4bd6e6a226362
parent 579dc130017b1a115333169e30ab4c3098061c41

Merge "Update string used as summary when an option is disabled by policy." into nyc-dev

packages/SettingsLib/res/values/strings.xml

diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 654b398..57c5684 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -778,7 +778,7 @@
     <string name="battery_info_status_full">Full</string>
 
     <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
-    <string name="disabled_by_admin_summary_text">Disabled by administrator</string>
+    <string name="disabled_by_admin_summary_text">Controlled by admin</string>
 
     <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->
     <string name="home">Home</string>