tree 9eb94e00dd814d6aa93d4cb09a3e4195761c34d5
parent e20e72d8505ea678c278236bcf609bd3cb90ea9d
parent 05eef64cc1ffc7e56675c77cd2c8f06f615a23f1
author Thierry Strudel <tstrudel@google.com> 1601014735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601014735 +0000

[automerger skipped] Merge "BatteryStatsImpl: Add mBatteryTimeToFull to parcel" am: dee14d2d86 am: b88e1801bd am: 3605379546 am: 05eef64cc1 -s ours

am skip reason: Change-Id I844149d4787e3aef7808bb4f85b0f08d179c5c41 with SHA-1 3d4cba5628 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430103

Change-Id: Ifbf5af84537fb2e0e4b2e42317bedd892235e974