| commit | ec4ff8f9c25af405b37a86fe031758a1ee4fb1bb | [log] [tgz] |
|---|---|---|
| author | Philip Junker <philipjunker@google.com> | Fri Oct 07 13:56:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 07 13:56:42 2022 +0000 |
| tree | df471f44d56ae1594d0c9d64561a473396ed954d | |
| parent | f1c812d306e5165d95680be4c0b9246f1614247a [diff] | |
| parent | 4928d74f0d7cee846953ae7a2d36eff2375049a6 [diff] |
[automerger skipped] Sync BatteryStats user activity types with PowerManager ones. am: 4928d74f0d -s ours am skip reason: Merged-In I234a999cf41da0346ce4d9f05663cae116b095a3 with SHA-1 20fde6c3b1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19993024 Change-Id: I710c0e4c80d78adfc38bb76caf23366eb5537d52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>