tree 6e1c51317da74ebf29ca31cdfa81376afe144e9f
parent 3834421c96ec503eff36e3eedceb7a06558a2a40
parent 6d79993cb3abaf7667dbadf1d9d8c5d63374af8d
author Adam Bookatz <bookatz@google.com> 1496889794 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496889800 +0000

Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev