tree faac61da44ae162b5165d562d774afaeac736d4a
parent cc6e41a44524592c9b477f99fcc738dea7538811
parent 6ecf30f2d8707de4c71272949afc2e6e6818e715
author Brad Fitzpatrick <bradfitz@android.com> 1299523601 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299523601 -0800

am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."

* commit '6ecf30f2d8707de4c71272949afc2e6e6818e715':
  Fix SpareParts crash going into battery stats.