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

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

Browse Source 
* commit 'fbeeac8266c190afba084cfc1164385ff5020fce':
  Add a tag to separate paragraphs in Javadoc
This commit is contained in:
Paul Crowley
2014-12-02 14:48:57 +00:00
committed by Android Git Automerger
parent 3590a45ed2 fbeeac8266
commit f57d9dcbc7
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
* 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;