OSDN Git Service

am 76029cc5: am 493244d3: (-s ours) am 92a3914f: Merge "BatteryStats: Remove uid_cput...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 17:01:01 +0000 (17:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 17:01:01 +0000 (17:01 +0000)
* commit '76029cc5e2ec7bf11d3b2dcd6fd23d8c9dd2d08c':


Trivial merge