Dianne Hackborn 75f0024cf4 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread ...

Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.

2010-09-07 14:15:17 -07:00

..

config

…

java

am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread

2010-09-07 14:15:17 -07:00

jni

am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread

2010-09-07 11:30:08 -07:00

res

am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread

2010-09-07 11:08:19 -07:00

tests

am 947e25e5: am ac3c1f55: Add BT test instrumentation for reboot tests.

2010-09-02 14:59:00 -07:00