tree 368907426fbab72ac4e2cd717e2bacba22d2ed8e
parent 61c0bf5464e085eb410e83ff906123af01552a18
parent 64096f1e783bffd26ae6d73c824f36c2640207a2
author Kweku Adams <kwekua@google.com> 1557467440 -0700
committer android-build-merger <android-build-merger@google.com> 1557467440 -0700

Merge "Fix accounting bug in BatteryStatsImpl." into qt-dev
am: 64096f1e78

Change-Id: I5eef76c4b0acd8d041b08c5babee9c6118bed979