aboutsummaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2016-06-17 19:42:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-17 19:42:03 +0000
commitbd70119beb05f6f57122e928aad5aa0d1d8a31b9 (patch)
tree3ded3c4dfd7cc375c2656067c8aff4fd5e212f0c /admin
parentc055b7b6bd25e6c3a3033fcdeaaedcc39c5f5eb6 (diff)
parent068cac1cc44f776b947f64a9efaebb51797480a4 (diff)
downloadandroid-bd70119beb05f6f57122e928aad5aa0d1d8a31b9.tar.gz
Merge \\\"samples: Remove compileSdkVersion/targetSdkVersion from template-parms\\\" into nyc-dev am: a23225e719 am: f6bb7e5cc8
am: 068cac1cc4 Change-Id: Id785ac2b1ff967b456bb55a085681001cded2b8d
Diffstat (limited to 'admin')
-rw-r--r--admin/BasicManagedProfile/template-params.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/BasicManagedProfile/template-params.xml b/admin/BasicManagedProfile/template-params.xml
index 7b88933d..313a5879 100644
--- a/admin/BasicManagedProfile/template-params.xml
+++ b/admin/BasicManagedProfile/template-params.xml
@@ -32,7 +32,7 @@
enable or disable other apps and how to set restrictions to them. Intents can be
configured to be forwarded between primary account and managed profile. Finally, you can
wipe all the data associated with the profile.
- Note that there can only be one managed profile on a device.
+ Note that there can only be one managed profile on a device.
]]>
</intro>
</strings>