Ken Sumrall c7fcc5076f Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1

2011-03-10 19:24:42 -08:00

..

config

…

java

Merge "Inline HTML5 Video support" into honeycomb-mr1

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

jni

Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1

2011-03-10 19:24:42 -08:00

res

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

2011-03-10 14:46:18 -08:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00