| commit | 768542e38d356bd18cb567dacc89c504d128ccd4 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri May 20 17:32:44 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 20 17:32:45 2016 +0000 |
| tree | e8d70b544390f8030c7d68b6abc7c9a50beece89 | |
| parent | 9f981621b24c11536f6791abfd61573e7c4b0267 [diff] | |
| parent | acb5ac77a3ba06bbd7e96e0ad268aa887a35418c [diff] |
Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp