commit | 6103e0445f84c7bbe6394c6c999a86c0e04aec8d | [log] [tgz] |
---|---|---|
author | Bookatz <bookatz@google.com> | Mon May 08 18:57:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 08 18:57:34 2017 +0000 |
tree | 8ee38cb5c0989831c506e92cbadbeff856a6220a | |
parent | 6d70b7aa2fea2605667cc29bf50696093319e37b [diff] | |
parent | 6b1989c7e28a56c16ffd6bd80c7967419191cbac [diff] |
Merge changes from topic 'wakelockTotalDuration' into oc-dev am: 6b1989c7e2 Change-Id: I04a7323ed927ebfad40129166d7e0cc61be7b3af