diff options
| author | 2022-10-07 16:05:56 +0000 | |
|---|---|---|
| committer | 2022-10-07 16:05:56 +0000 | |
| commit | 712161492a6fcf102be6b273e3df8fe590e34e39 (patch) | |
| tree | 4011a2fbe639e8d0c022e03ecf24838c646c00b0 /libs/androidfw/StringPool.cpp | |
| parent | ea0d817d8b85916915071a18179b5504f025043d (diff) | |
| parent | 715cba5f633b96bfae8c6fbb5b6dbfc14933ec6e (diff) | |
[automerger skipped] Sync BatteryStats user activity types with PowerManager ones. am: 715cba5f63 -s ours
am skip reason: Merged-In I234a999cf41da0346ce4d9f05663cae116b095a3 with SHA-1 4928d74f0d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19783834
Change-Id: I85ec396056146d7169d228011f877aa1774d5c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions