am 6a25c6f6: am 562daf5c: am 8d8d2419: Merge "Strings: replace work space by work profile" into lmp-dev

* commit '6a25c6f61210f8d498f5e603c3cdaaf6dba9d655':
  Strings: replace work space by work profile
This commit is contained in:
Jessica Hummel
2014-08-21 10:39:14 +00:00
committed by Android Git Automerger

View File

@@ -3969,9 +3969,9 @@
<string name="permission_request_notification_with_subtitle">Permission requested\nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>
<!-- Message to show when an intent automatically switches users into the personal profile. -->
<string name="forward_intent_to_owner">You\'re using this app in your personal space</string>
<string name="forward_intent_to_owner">You\'re using this app in your personal profile</string>
<!-- Message to show when an intent automatically switches users into a work profile. -->
<string name="forward_intent_to_work">You\'re using this app in your work space</string>
<string name="forward_intent_to_work">You\'re using this app in your work profile</string>
<!-- Label to show for a service that is running because it is an input method. -->
<string name="input_method_binding_label">Input method</string>