tree ab0dfed4cea4f16bd2456905380fef48481fc016
parent fed3c364e6fc6acc5e5836bd1370c3c278f8a248
parent 3bee5af8162c177f8c8f4199489a401058ab26a9
author Dianne Hackborn <hackbod@google.com> 1280172256 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172256 -0700

am 3bee5af8: Battery stats: start removing last stats, keep total discharge.

Merge commit '3bee5af8162c177f8c8f4199489a401058ab26a9' into gingerbread-plus-aosp

* commit '3bee5af8162c177f8c8f4199489a401058ab26a9':
  Battery stats: start removing last stats, keep total discharge.