Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '05f23d974bdfc5fb221f0bfa5bef4e9c915e52d9':
  Add a tag to separate paragraphs in Javadoc
This commit is contained in:
Paul Crowley
2014-12-02 15:04:15 +00:00
committed by Android Git Automerger
parent 71bbbf6d59 05f23d974b
commit ef370c0ca0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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;