Ken Sumrall c25e6de94d am 9246e4ed: am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1 ...

* commit '9246e4edbab5f24dc06df34992493c64c50fd380':
  Teach the framework to use the new android_reboot() function.

2011-03-10 19:29:52 -08:00

..

config

…

java

am 37ee248b: am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1

2011-03-10 17:15:08 -08:00

jni

am 9246e4ed: am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1

2011-03-10 19:29:52 -08:00

res

am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-10 14:47:57 -08:00

tests

am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1

2011-03-10 16:01:45 -08:00