Dianne Hackborn 36e5f667bc resolved conflicts for merge of 2eb12a47 to master ...

Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99

2010-06-24 16:29:54 -07:00

..

config

…

java

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

jni

am db1bae9a: am 9bf39efb: Do not log AT command traffic by default.

2010-06-24 12:29:06 -07:00

res

Merge "Add a splash screen to the webruntime."

2010-06-24 10:47:15 -07:00

tests

fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f

2010-06-17 16:54:56 -07:00