tree 7845c43fd30484b450d101f924bc70d1b7f6c8f8
parent 44188ffbf917949c5df81d37f2bff61564490239
parent 7cd60173144a88d330a14f38404b835b30a42654
author Dianne Hackborn <hackbod@google.com> 1280172606 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280172606 -0700

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

Merge commit '443d884e16fad2e01a97aa788d4b30de53c94048'

* commit '443d884e16fad2e01a97aa788d4b30de53c94048':
  Battery stats: start removing last stats, keep total discharge.