merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dbdec2d..2bb1d82 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4478,7 +4478,7 @@
<!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
<string name="user_rename">RENAME</string>
<!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
- <string name="app_restrictions_custom_label">Set application limits</string>
+ <string name="app_restrictions_custom_label">Set app restrictions</string>
<!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
<string name="user_restrictions_controlled_by">Controlled by <xliff:g id="app">%1$s</xliff:g></string>
<!-- Summary for apps that aren't supported in limited users [CHAR LIMIT=none] -->
