diff options
| author | Paul Crowley <paulcrowley@google.com> | 2014-12-02 15:04:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 15:04:15 +0000 |
| commit | ef370c0ca08cfdae1b33edcdb121790bb4eb1844 (patch) | |
| tree | e4f285ec133e63ad1a1d48d28054efe5779a3813 /core/java/android/app/admin | |
| parent | 71bbbf6d59d564d6dd293095d1f5b5bef4e0eb51 (diff) | |
| parent | 05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9 (diff) | |
| download | frameworks_base-ef370c0ca08cfdae1b33edcdb121790bb4eb1844.zip frameworks_base-ef370c0ca08cfdae1b33edcdb121790bb4eb1844.tar.gz frameworks_base-ef370c0ca08cfdae1b33edcdb121790bb4eb1844.tar.bz2 | |
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
Diffstat (limited to 'core/java/android/app/admin')
| -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 50d6b11..53e0896 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1485,8 +1485,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; |