am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs

* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.

2 files changed, 8 insertions, 6 deletions

diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java
index 381d85147807..c53e74901c57 100644
--- a/core/java/android/app/admin/DeviceAdminReceiver.java
+++ b/core/java/android/app/admin/DeviceAdminReceiver.java
@@ -208,7 +208,8 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
      * requested provisioning. In the device owner case the profile is the primary user.
      * The broadcast will also be limited to the {@link DeviceAdminReceiver} component
      * specified in the original intent or NFC bump that started the provisioning process
-     * (@see DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE).
+     * (see {@link DevicePolicyManager#ACTION_PROVISION_MANAGED_PROFILE
+     * DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE}).
      *
      * <p>A device admin application which listens to this intent can find out if the device was
      * provisioned for the device owner or profile owner case by calling respectively
@@ -225,8 +226,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
     /**
      * Name under which a DevicePolicy component publishes information
      * about itself.  This meta-data must reference an XML resource containing
-     * a device-admin tag.  XXX TO DO: describe syntax.
+     * a device-admin tag.
      */
+    //  TO DO: describe syntax.
     public static final String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
 
     private DevicePolicyManager mManager;
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 6160bb6ca8b7..a01a96a916bc 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -101,14 +101,14 @@ public class DevicePolicyManager {
      * device as a personal and corporate device. The user which provisioning is started from and
      * the managed profile share a launcher.
      *
-     * <p>This intent will typically be sent by a mobile device management application (mdm).
-     * Provisioning adds a managed profile and sets the mdm as the profile owner who has full
-     * control over the profile
+     * <p>This intent will typically be sent by a mobile device management application (MDM).
+     * Provisioning adds a managed profile and sets the MDM as the profile owner who has full
+     * control over the profile.
      *
      * <p>This intent must contain the extra {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}.
      *
      * <p> When managed provisioning has completed, an intent of the type
-     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcasted to the
+     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcast to the
      * managed profile.
      *
      * <p> If provisioning fails, the managedProfile is removed so the device returns to its