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

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

Browse Source 
* commit 'f57d9dcbc7ecbae8bc8f821532a508c22bc3327f':
  Add a tag to separate paragraphs in Javadoc
This commit is contained in:
Paul Crowley
2014-12-02 14:57:31 +00:00
committed by Android Git Automerger
parent 86390e72a1 f57d9dcbc7
commit 05f23d974b
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

@@ -1481,8 +1481,8 @@ public class DevicePolicyManager {
* Flag for {@link #wipeData(int)}: also erase the factory reset protection * Flag for {@link #wipeData(int)}: also erase the factory reset protection
* data. * data.
* *
* This flag may only be set by device owner admins; if it is set by other * <p>This flag may only be set by device owner admins; if it is set by
* admins a {@link SecurityException} will be thrown. * other admins a {@link SecurityException} will be thrown.
*/ */
public static final int WIPE_RESET_PROTECTION_DATA = 0x0002; public static final int WIPE_RESET_PROTECTION_DATA = 0x0002;