summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sudheer Shanka <sudheersai@google.com> 2016-02-19 18:15:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-19 18:15:33 +0000
commit82f927bd28a1c57bce663771ccef77a7d515c9f7 (patch)
treedf11020d6c7bf579e21b41a0e64c2c80c7834182
parent1d3c41e563c30d85d5524df598f4bd6e6a226362 (diff)
parent579dc130017b1a115333169e30ab4c3098061c41 (diff)
Merge "Update string used as summary when an option is disabled by policy." into nyc-dev
-rw-r--r--packages/SettingsLib/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 654b398358c7..57c56847759e 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>