am 05f23d97: am f57d9dcb: am fbeeac82: Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev

* commit '05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9':
  Add a tag to separate paragraphs in Javadoc
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 50d6b11..53e0896 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1485,8 +1485,8 @@
      * Flag for {@link #wipeData(int)}: also erase the factory reset protection
      * data.
      *
-     * This flag may only be set by device owner admins; if it is set by other
-     * admins a {@link SecurityException} will be thrown.
+     * <p>This flag may only be set by device owner admins; if it is set by
+     * other admins a {@link SecurityException} will be thrown.
      */
     public static final int WIPE_RESET_PROTECTION_DATA = 0x0002;