am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a...
am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '733a2f65' into kraken
* commit '733a2f65':
Fix a crash in BatteryStatsImpl, due to a previous fix.