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

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

[automerger skipped] Merge "Sync BatteryStats user activity types with... 

[automerger skipped] Merge "Sync BatteryStats user activity types with PowerManager ones." into tm-qpr-dev-plus-aosp am: 998b368a -s ours

am skip reason: Merged-In I234a999cf41da0346ce4d9f05663cae116b095a3 with SHA-1 20fde6c3 is already in history

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



Change-Id: I1762dbd620021c9f3001fb7f631bc8f764f7e599
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec4ff8f9 998b368a
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