Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 95a7244c authored by Philip Junker's avatar Philip Junker Committed by Automerger Merge Worker
Browse files

[automerger skipped] Sync BatteryStats user activity types with PowerManager... 

[automerger skipped] Sync BatteryStats user activity types with PowerManager ones. am: 715cba5f -s ours am: 71216149 -s ours

am skip reason: Merged-In I234a999cf41da0346ce4d9f05663cae116b095a3 with SHA-1 4928d74f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19783834



Change-Id: I6319767d9003ada31eee9376779b61fc0a87e100
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d11cafb 71216149
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment