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

am: 82f927bd28

* commit '82f927bd28a1c57bce663771ccef77a7d515c9f7':
  Update string used as summary when an option is disabled by policy.
This commit is contained in:
Sudheer Shanka
2016-02-19 18:25:57 +00:00
committed by android-build-merger

View File

@@ -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>