OSDN Git Service

Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
authorAmith Yamasani <yamasani@google.com>
Tue, 22 Nov 2011 19:02:49 +0000 (11:02 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 22 Nov 2011 19:02:49 +0000 (11:02 -0800)

Trivial merge