commit | 3da7c56dd89442cf08f4a407317242d23398d82a | [log] [tgz] |
---|---|---|
author | Adam Bookatz <bookatz@google.com> | Fri May 19 18:41:45 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 19 18:41:45 2017 +0000 |
tree | 1faf6341501c36467ecc4f4487fa86d7d09f821b | |
parent | d5ff58d0265cc1affa157cb910b7f0735acf1973 [diff] | |
parent | 95cf947fbaae377c82a86c3c0cb7906f476a80aa [diff] |
Merge "Cumulative wakelock time per uid" into oc-dev am: 1effe000b8 am: 95cf947fba Change-Id: I58660c0671a49388f8b9fdff28060e9312fa497d