am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev

Browse Source

* commit '02a400ca6e5a185906b743c379716f9315e03bb2':
  Device policy: consistent javadoc and annotations

...

This commit is contained in:

Robin Lee

2015-06-02 20:02:07 +00:00

committed by Android Git Automerger

parent 2a3443c49b 02a400ca6e

commit 805402de76

1 changed files with 227 additions and 225 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

452

core/java/android/app/admin/DevicePolicyManager.java

File diff suppressed because it is too large Load Diff