Jeff Hamilton df5d015ae2 resolved conflicts for merge of dc54a8c7 to honeycomb-merge ...

Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8

2011-01-28 20:41:42 -06:00

..

config

…

java

resolved conflicts for merge of dc54a8c7 to honeycomb-merge

2011-01-28 20:41:42 -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