tree ea6a78f3820b7bd2c567d47334a9644991d5cfbb
parent 0430ee5acb1afe4d1e950eb586d302e35d0c49b1
parent a7c837f043c1ca0bdecd42645ba7da8c5717566d
author Dianne Hackborn <hackbod@google.com> 1389836346 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389836346 +0000

Merge "Add battery power use reporting to batterystats service."