From: Adam Bookatz <bookatz@google.com>
Date: Thu, 8 Jun 2017 06:26:13 +0000 (+0000)
Subject: Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029b... 
X-Git-Tag: android-x86-9.0-r1~2991
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=647e34a0735aa4ca17db261da079f63f7d62956d;p=android-x86%2Fframeworks-base.git

Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp
am: 36e8ee9c1f

Change-Id: I2a6635ee9f53510661e9f15e32b3959bbd440aae
---

647e34a0735aa4ca17db261da079f63f7d62956d