diff options
| author | Nicolas Falliere <nicof@google.com> | 2012-06-18 17:45:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 17:45:40 -0700 |
| commit | 4d2bef3f850e75744ade93f95615c7cb4a7fefa0 (patch) | |
| tree | c00ce4871ecaf2faaea01375120850043185510a /services/java/com/android/server/PowerManagerService.java | |
| parent | 3eda1903c709904da9a1668b0ba9c46f13cd9f80 (diff) | |
| parent | 277c09f6c16c4adfd50407e2fa4dbf61a0e06e55 (diff) | |
am 277c09f6: am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '277c09f6c16c4adfd50407e2fa4dbf61a0e06e55':
Added or fixed doctrings for required permissions.
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
0 files changed, 0 insertions, 0 deletions