tree 8562adb23da30b8a6c586745d73e2a1afc38a2bd
parent 810796ca6a741dc3a4afb9015ac46c97049b58be
parent 2a098fe90ab0e60c2326e9aedbfdd85529de782f
author Adam Lesinski <adamlesinski@google.com> 1438135851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438135851 +0000

am 2a098fe9: am 2529d39d: am 858e4a6f: am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

* commit '2a098fe90ab0e60c2326e9aedbfdd85529de782f':
  BatteryStats: Use proper power calculator when energy data is received