am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev

Browse Source

* commit 'f4d9ecc503e7e849ff37a4674680c7213d819592':
  Revert "Consistent documentation and annotations for DPMS"

...

This commit is contained in:

Robin Lee

2015-06-02 18:29:45 +00:00

committed by Android Git Automerger

parent 9b286dd637 f4d9ecc503

commit b35307343a

1 changed files with 192 additions and 188 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

380

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

File diff suppressed because it is too large Load Diff