Jeff Hamilton 992f75bcd0 resolved conflicts for merge of 6687ecb4 to honeycomb-merge ...

Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec

2011-01-27 10:44:21 -06:00

..

config

…

java

resolved conflicts for merge of 6687ecb4 to honeycomb-merge

2011-01-27 10:44:21 -06:00

jni

Use optimized display lists for all hwaccelerated rendering

2011-01-24 08:43:20 -08:00

res

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

2011-01-24 13:46:28 -08:00

tests

Change the default ssid from GoogleGuest to the opennet for the power test.

2011-01-21 14:06:22 -08:00