[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>
This commit is contained in:
Philip Junker
2022-10-07 16:05:56 +00:00
committed by Automerger Merge Worker

Diff Content Not Available