tree ebd08c379454e3064eb73207d60147d16406c2ad
parent 1316ac7a593363c4947b28dff413ba9c64b075a2
parent 978abf43d336ea516d8b61afcd90202330fd275d
author Dianne Hackborn <hackbod@google.com> 1299714634 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299714634 -0800

am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1

* commit '7b5cb3c033f758368580664a8bdad43b47f3682d':
  Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...