commit | fea0c3af7abeec54f47292698e16a556f653bbc0 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Fri May 20 17:32:42 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 20 17:32:42 2016 +0000 |
tree | 81227d10917ccd946e4461a5b7a6603f6869aded | |
parent | 6c7ea25a2b3f219dd3fe540fd97ee10ac5f2d77d [diff] | |
parent | 6f0d3992149aa782450667ed750fe0c3cf8ee334 [diff] |
Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 * commit '6f0d3992149aa782450667ed750fe0c3cf8ee334': Fix parsing of kernel wakelocks Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e