tree 295d5689fa3953575d2d8ce5afeb9e3949a56b80
parent b8ac11d57577ed30be53fdafc186b31f2b704844
parent 9f06e429edf34e6add26a45d9b9ace20d44e0a8c
author Brad Fitzpatrick <bradfitz@android.com> 1299523920 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299523920 -0800

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

* commit '9f06e429edf34e6add26a45d9b9ace20d44e0a8c':
  Fix SpareParts crash going into battery stats.