tree 53c5dfdcd83ac209b4ba822b26415f3a5de7cac7
parent be1b7ddb44373b9373dcd1342d40fb02ef18238e
parent e83f322fa91f64844ea24aab2944540ca43a2a01
author Dianne Hackborn <hackbod@google.com> 1412183369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412183369 +0000

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

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