summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Dmitri Plotnikov <dplotnikov@google.com> 2023-11-27 17:11:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-27 17:11:48 +0000
commit35b0ec9c0e78605dd80ae6ca97c90fdf4294de4e (patch)
treeb395227da3558c4b60ef18b57e1cf1fe268b556a /libs/androidfw/FileStream.cpp
parentfde7a7dbcb3a3ba14a3145763b5f70d8e7869dfd (diff)
parent36de7b5142cc3f5e5956ff5c91ccdd07d0b31cc4 (diff)
Merge changes I488715c8,I2333568d,Iea68a8d3 into main
* changes: Share UID mapping logic between BatteryStats and PowerStatCollectors Export aggregated PowerStats as BatteryUsageStats Untangle circular dependency between BatteryStats and BatteryUsageStatsProvider
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions