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

Browse Source

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>

...

This commit is contained in:

Philip Junker

2022-10-07 16:06:17 +00:00

committed by Automerger Merge Worker

parent 712161492a 9b5f8d21ed

commit 24c7dff753

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available