am d61b61d6: am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1

* commit 'd61b61d6f97f9f73b86e4a24a747c4451f2bc939':
  Fix an NPE on overflow in BatteryStats history.