diff options
| author | 2022-10-07 16:06:17 +0000 | |
|---|---|---|
| committer | 2022-10-07 16:06:17 +0000 | |
| commit | 24c7dff753bceb90db69ed789c5ebbdde7e7990e (patch) | |
| tree | 4011a2fbe639e8d0c022e03ecf24838c646c00b0 /libs/androidfw/StringPool.cpp | |
| parent | 712161492a6fcf102be6b273e3df8fe590e34e39 (diff) | |
| parent | 9b5f8d21ed55c6734aaa2cc417b93d0ca2b371b0 (diff) | |
[automerger skipped] Merge "Sync BatteryStats user activity types with PowerManager ones." into tm-qpr-dev am: 9b5f8d21ed -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: I67026ec41284fd69fad8740c7dbbdb353b9c2c99
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