OSDN Git Service

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
authorAdam Bookatz <bookatz@google.com>
Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)
commit0fcadeaeb970ed9322eef8fcb685de1d20f72c65
treedf2b6ad5719bb90b1a9307af4514cbf7cdbbd359
parent23e5a1ee6527f7d2728b02583263266d855de5ae
parent6029bce3b484c7fffa62356346e7d00f898f1fdb
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am: 6029bce3b4

Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
core/java/android/os/BatteryStats.java