Amith Yamasani 0d00fa958f am 227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1 ...

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

2011-11-22 11:05:01 -08:00

..

java

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

2011-11-22 11:05:01 -08:00

jni

am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

2011-11-15 19:19:04 -08:00

res

am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

2011-11-21 15:31:32 -08:00

tests

am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0

2011-11-15 11:10:44 -08:00