commit | d9ff894eae0b3acd3c89585a80ebd2039ed1de8c | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu Oct 03 15:39:18 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 15:39:18 2013 -0700 |
tree | 32045234c6359f831a332af2718e839c5d493c7c | |
parent | 12585551f4ccf08906519b9e8e9b29a5b5de93b0 [diff] | |
parent | 05f56fc121e176ef4e227639a7b636a875f38037 [diff] |
am 05f56fc1: am 95867a65: Merge "Add PowerManager method to assign blame to a single uid" into klp-dev * commit '05f56fc121e176ef4e227639a7b636a875f38037': Add PowerManager method to assign blame to a single uid