OSDN Git Service

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029b...
authorAdam Bookatz <bookatz@google.com>
Thu, 8 Jun 2017 06:26:13 +0000 (06:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 06:26:13 +0000 (06:26 +0000)
am: 36e8ee9c1f

Change-Id: I2a6635ee9f53510661e9f15e32b3959bbd440aae


Trivial merge