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)
commit647e34a0735aa4ca17db261da079f63f7d62956d
treea33bb33bdc3caef08fb0754a449dea626cfc5f98
parentc50248488dc2b88c7a89eafaec607bdc371fd2e4
parent36e8ee9c1f935aebdf65ffa393e922ec09eed69d
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp
am: 36e8ee9c1f

Change-Id: I2a6635ee9f53510661e9f15e32b3959bbd440aae