Jeff Brown 76a23f8b2e resolved conflicts for merge of eebc944f to master ...

Change-Id: I969cf69d2bd6901742d2cdf1bd44344ee7ba9fc7

2011-01-24 16:43:28 -08:00

..

config

…

java

resolved conflicts for merge of eebc944f to master

2011-01-24 16:43:28 -08:00

jni

am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb

2011-01-24 13:30:37 -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