commit | b95b1a2eff9f1a56633d25b531db5b8fc9d2e197 | [log] [tgz] |
---|---|---|
author | Michael Wachenschwanz <mwachens@google.com> | Mon Mar 08 23:46:08 2021 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 08 23:46:08 2021 +0000 |
tree | ad11450aa992f39cf493d88b610a622452714904 | |
parent | 7af559a69d7ce3b2eaf39e4ae646607a705dd9c8 [diff] | |
parent | 68b8157e4eb7bba5a2d25850762c730058714b54 [diff] |
Merge changes from topic "cpuEnergyAttribution" into sc-dev * changes: Accumulate charge instead of energy in BatteryStatsImpl Accumulate and attribute measured Cpu energy in BatteryStats