am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev

Browse Source

* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS

...

This commit is contained in:

Robin Lee

2015-06-02 21:09:03 +00:00

committed by Android Git Automerger

parent b9b9db72f8 9b286dd637

commit b95551290a

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