am e6910a4c: am fce45015: Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev

* commit 'e6910a4cf2e3675a68efe7fb019ea65d719df009':
  Several improvements and fixes in restrictions UI
This commit is contained in:
Amith Yamasani
2013-04-23 11:16:48 -07:00
committed by Android Git Automerger
3 changed files with 86 additions and 37 deletions

View File

@@ -4475,6 +4475,8 @@
<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] -->
<string name="app_not_supported_in_limited">This app is not supported in limited users</string>
<!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
<string name="app_sees_restricted_accounts">This app can access your accounts</string>
<!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
<string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>