summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Michael Wachenschwanz <mwachens@google.com> 2021-03-08 23:46:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-08 23:46:08 +0000
commitb95b1a2eff9f1a56633d25b531db5b8fc9d2e197 (patch)
treead11450aa992f39cf493d88b610a622452714904 /libs/androidfw/AssetsProvider.cpp
parent7af559a69d7ce3b2eaf39e4ae646607a705dd9c8 (diff)
parent68b8157e4eb7bba5a2d25850762c730058714b54 (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
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions