diff options
| author | 2022-10-07 16:48:55 +0000 | |
|---|---|---|
| committer | 2022-10-07 16:48:55 +0000 | |
| commit | 82831e21fdf521b13680fe6fd70bfadbc25f975a (patch) | |
| tree | cea6750702fdf6e2b8ed8218c8aef5ba0fd66a2a /libs/androidfw/ResourceTimer.cpp | |
| parent | 95a7244c3485568a2efc8f0821f10eb585a69bd7 (diff) | |
| parent | 24c7dff753bceb90db69ed789c5ebbdde7e7990e (diff) | |
[automerger skipped] Merge "Sync BatteryStats user activity types with PowerManager ones." into tm-qpr-dev am: 9b5f8d21ed -s ours am: 24c7dff753 -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: I261b7ce925ee54f0f3f46f9d8328c157f81679dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions