am ab054dc1: am 06ad8ce5: am d47f15a4: Merge "Apply predefined icon and label to managed profiles" into lmp-mr1-dev

* commit 'ab054dc138041e5cb77b24aab0f85a40e78eb942':
  Apply predefined icon and label to managed profiles
This commit is contained in:
Alexandra Gherghina
2014-11-04 14:03:02 +00:00
committed by Android Git Automerger
5 changed files with 34 additions and 35 deletions

View File

@@ -5189,8 +5189,6 @@
<string name="user_add_user_menu">Add user</string>
<!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
<string name="user_summary_restricted_profile">Restricted profile</string>
<!-- User settings summary for a work profile [CHAR LIMIT=50] -->
<string name="user_summary_managed_profile">Work profile</string>
<!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
<string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
<!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->