Nick Pelly 30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge ...

Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885

2011-01-25 16:13:17 -08:00

..

config

…

java

resolved conflicts for merge of d64d711d to honeycomb-merge

2011-01-25 16:13:17 -08: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