tree d698909740ec5fbcb08270d3043eb6223ae4b454
parent 38646c19d8badea143113c0dc48ccdacb18badc4
author Dianne Hackborn <hackbod@google.com> 1412040682 -0700
committer Dianne Hackborn <hackbod@google.com> 1412040682 -0700

Fix issue #17705755: Battery stats resets at incorrect times

Revert back to (mostly) KK behavior, fix a problem where we were
collecting some data in an inconsistent state.

Change-Id: Ida3ca3fb734a9d7d61a90fd5044152e927c59e02