tree 087bf34feab81a201b998911e30fb41b1f81a8d9
parent 7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec
parent 45f06460e9aeadadad27e6c87817940cd96128ef
author Amith Yamasani <yamasani@google.com> 1321988569 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321988569 -0800

Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1