Jean-Baptiste Queru 99a518ffab resolved conflicts for merge of ca48433a to master ...

Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990

2010-07-20 10:40:17 -07:00

..

config

…

java

resolved conflicts for merge of ca48433a to master

2010-07-20 10:40:17 -07:00

jni

Add support for linear gradients.

2010-07-19 18:44:05 -07:00

res

Add support for emulating external storage on devices with no SD card

2010-07-19 18:25:03 -04:00

tests

am d652751d: am b6761e73: am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 16:25:27 -07:00