Jeff Hamilton b0cae14175 Merge commit '446aea40' into manualmerge ...

Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975

2011-01-24 16:31:38 -06:00

..

config

…

java

Merge commit '446aea40' into manualmerge

2011-01-24 16:31:38 -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

am 588b1e45: Merge "Change the default ssid from GoogleGuest to the opennet for the power test." into honeycomb

2011-01-21 14:28:52 -08:00