OSDN Git Service

Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 1 Jul 2015 00:40:00 +0000 (00:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Jul 2015 00:40:25 +0000 (00:40 +0000)

Trivial merge