diff options
| author | Nicolas Prévot <nprevot@google.com> | 2015-07-29 13:20:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 13:20:39 +0000 |
| commit | 4da7081bd8bf02e2ffd93af62b690be8d1b0b770 (patch) | |
| tree | 4b9d7ddc7917f4fb3722bdc4aa1a37c49c0451f2 | |
| parent | 1463e64d96619664a8a61b5da23c33340b415bed (diff) | |
| parent | b60d3628a00f5a1d39548e6d3021e35e6c93fc73 (diff) | |
| download | android_packages_apps_ManagedProvisioning-4da7081bd8bf02e2ffd93af62b690be8d1b0b770.tar.gz android_packages_apps_ManagedProvisioning-4da7081bd8bf02e2ffd93af62b690be8d1b0b770.tar.bz2 android_packages_apps_ManagedProvisioning-4da7081bd8bf02e2ffd93af62b690be8d1b0b770.zip | |
am b60d3628: am df02ac7d: Merge "Update the user consent string for device owner provisioning flow." into mnc-dev
* commit 'b60d3628a00f5a1d39548e6d3021e35e6c93fc73':
Update the user consent string for device owner provisioning flow.
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index df44514c..c49bde11 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -30,7 +30,7 @@ <!-- The text that asks for user consent to create a work profile [CHAR LIMIT=NONE] --> <string name="company_controls_workspace">Your organization controls this profile and keeps it secure. You control everything else on your device.</string> <!-- The text that asks for user consent to set up a work device [CHAR LIMIT=NONE] --> - <string name="company_controls_device">With Android for Work, your organization can manage your corporate email and other apps on your phone or tablet.\nYour organization controls your device and keeps it secure.</string> + <string name="company_controls_device">Your organization will control this device and keep it secure.</string> <!-- String shown above the icon of the app that will control the work profile after it is set up. [CHAR LIMIT=NONE]--> <string name="the_following_is_your_mdm">The following app will need to access this profile:</string> <!-- String shown above the icon of the app that will control the work device after it is set up. [CHAR LIMIT=NONE]--> |