diff options
| author | 2014-12-02 14:44:24 +0000 | |
|---|---|---|
| committer | 2014-12-02 14:44:27 +0000 | |
| commit | fbeeac8266c190afba084cfc1164385ff5020fce (patch) | |
| tree | 0228aa23b5daffe9c89d2f11d9231efc2b9f4a63 | |
| parent | c3056190ae1a6d29ce5943d45ab4711e1e49620c (diff) | |
| parent | 2934b266e507ddda7d64201be7850af4589b9c9e (diff) | |
Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 0e1c85c4cb2d..47530997eb6e 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1481,8 +1481,8 @@ public class DevicePolicyManager { * 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; |