summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jenny Ho <hsiufangho@google.com> 2024-11-22 01:20:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-22 01:20:46 +0000
commit9f5ab11dc4d9a624e2720b49416e593682440830 (patch)
tree54bc5580333c7e961bbb523329616ce557993f23 /libs/androidfw/ResourceTimer.cpp
parent17698f32b9c217f77f496f4d1e42378e633c37de (diff)
parent0e113d98d2d34d383d368d773cc1e8eb48eff5a0 (diff)
Merge "BatteryManager: update capacity level description" into main am: a591af0256 am: 0e113d98d2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3343570 Change-Id: I730b2c0f99f6cccedfe9cf132211686f8e357a52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions