OSDN Git Service

Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
authorLei Yu <jackqdyulei@google.com>
Wed, 28 Jun 2017 17:49:36 +0000 (17:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 Jun 2017 17:49:36 +0000 (17:49 +0000)

Trivial merge