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...