diff options
| author | 2014-06-10 16:56:26 +0000 | |
|---|---|---|
| committer | 2014-06-10 16:56:27 +0000 | |
| commit | ae87d9eede9ed4001dc16ff48c3f96684a817524 (patch) | |
| tree | 290a405d1d4c88c9b9e6e9a8c62bfa047e82b571 | |
| parent | 295609a9a58a367e7b54f3c777c218954606154b (diff) | |
| parent | e4e95a0a3b07333b6c23fb9cd31a2a1535c15080 (diff) | |
Merge "Updating the pictures and labels for cross-profile intents." into lmp-preview-dev
| -rw-r--r-- | core/res/res/drawable-hdpi/work_icon.png | bin | 1153 -> 4442 bytes | |||
| -rw-r--r-- | core/res/res/values/strings.xml | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/drawable-hdpi/work_icon.png b/core/res/res/drawable-hdpi/work_icon.png Binary files differindex e90866becc84..be8a36e8c716 100644 --- a/core/res/res/drawable-hdpi/work_icon.png +++ b/core/res/res/drawable-hdpi/work_icon.png diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 10edcc88ccd1..d521746723e8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -457,10 +457,10 @@ <string name="android_system_label">Android System</string> <!-- Label for the user owner in the intent forwarding app. --> - <string name="user_owner_label">Personal</string> + <string name="user_owner_label">Personal apps</string> <!-- Label for a corporate profile in the intent forwarding app. --> - <string name="managed_profile_label">Work</string> + <string name="managed_profile_label">Android for Work</string> <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgrouplab_costMoney">Services that cost you money</string> |
