tree 72d4127ed83259bdd610797be613d57d8292b025
parent 2a44d2333cddf0d6b3beda273002768e3be172d5
parent c3014c8cf8932cb6a482e985edc7def97c50eede
author Dianne Hackborn <hackbod@google.com> 1412095809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412095809 +0000

am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times