commit | bc9e59d1a7f52d41ecca65c0ea20868ea586b753 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Fri May 20 17:38:00 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 20 17:38:00 2016 +0000 |
tree | e8d70b544390f8030c7d68b6abc7c9a50beece89 | |
parent | 768542e38d356bd18cb567dacc89c504d128ccd4 [diff] | |
parent | fea0c3af7abeec54f47292698e16a556f653bbc0 [diff] |
Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: fea0c3af7a * commit 'fea0c3af7abeec54f47292698e16a556f653bbc0': Change-Id: Ie8244da32f0ca32077d98d627e3e5a967a810395