Nick Pelly 2478e617c4 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge ...

Change-Id: If5553e0b51513687c4012600d92323617190fb6c

2011-01-27 18:35:19 -08:00

..

config

…

java

resolved conflicts for merge of b7d6ffd7 to honeycomb-merge

2011-01-27 18:35:19 -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