tree ba6c470982eb20c3529732b718fb5aeb2fff0a1f
parent 3007cc30f224f560081091159c6f706b2ed0e4bc
parent d0ce1fbbba497e9b5082c69d8da7260e85b0b579
author Adam Lesinski <adamlesinski@google.com> 1441049604 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441049604 +0000

am d0ce1fbb: am 69e17f59: am da43a3aa: Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-dev

* commit 'd0ce1fbbba497e9b5082c69d8da7260e85b0b579':
  BatteryStats: Start using cpu power from kernel