| commit | 95a7244c3485568a2efc8f0821f10eb585a69bd7 | [log] [tgz] |
|---|---|---|
| author | Philip Junker <philipjunker@google.com> | Fri Oct 07 16:48:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 07 16:48:34 2022 +0000 |
| tree | cea6750702fdf6e2b8ed8218c8aef5ba0fd66a2a | |
| parent | 4d11cafb698faf536e120699fe0649e7b790b85b [diff] | |
| parent | 712161492a6fcf102be6b273e3df8fe590e34e39 [diff] |
[automerger skipped] Sync BatteryStats user activity types with PowerManager ones. am: 715cba5f63 -s ours am: 712161492a -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: I6319767d9003ada31eee9376779b61fc0a87e100 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>