am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo

Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.