OSDN Git Service

Merge "Turn on power accounting in AOSP" into oc-dev
authorjackqdyulei <jackqdyulei@google.com>
Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)
am: 0a6d61883c

Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea


Trivial merge