| commit | e95dee49e65d48fa80aa2dc194a400d1533e4cf4 | [log] [tgz] |
|---|---|---|
| author | Michael Wachenschwanz <mwachens@google.com> | Fri Oct 15 22:04:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 15 22:04:32 2021 +0000 |
| tree | 12a4ceca890b08ebe1292a6d61eaf52bd2e2c4c9 | |
| parent | 51b4902eccb9d9788293d0887c979062f60a6836 [diff] | |
| parent | 05c4ff8a0c34d36a610580cfada9a2ec56500b4a [diff] |
[automerger skipped] Merge "Update BatteryStatsImpl to handle multidisplay" into sc-v2-dev am: 684c0b4a77 am: 05c4ff8a0c -s ours am skip reason: Merged-In I4ad4f54b6897f406e4ec0f59834dd4762083e0d8 with SHA-1 5f05b4ffcf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15913462 Change-Id: Ibbef8f05361a4ef0384a0c99229591591c0eff96