OSDN Git Service

am 5e9e64c0: (-s ours) am d4c1861a: Merge "BatteryStats: Fix units in wakelock distri...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 07:41:14 +0000 (07:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:41:14 +0000 (07:41 +0000)
commit57d28033dd0ae2cddf21d15b5a627a927f796a71
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent53841ec2186ffa6f2b2352d10a21016f656956dc
parent5e9e64c000b55848ea5d2f812d63fc9bd5d4b41d
am 5e9e64c0: (-s ours) am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev

* commit '5e9e64c000b55848ea5d2f812d63fc9bd5d4b41d':