[automerger skipped] Merge "Revert "Don't reset BatteryStats on high battery level or signif..."" into tm-qpr-dev am: e85f211c66
am: 73e1d65775
-s ours am: ec55e6e687
-s ours
am skip reason: Merged-In I01b998cb9e6c39852bc96886fb25aa09bf09f3ea with SHA-1 0f28d80489
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/21732136
Change-Id: I1737425acab199cea27cb09ab35301032afb6756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9a4c1a8230