Jean-Baptiste Queru 12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master ...

Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905

2010-12-07 12:51:49 -08:00

..

config

…

java

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

jni

am 251384a7: Merge "Improve performance when getting styled string."

2010-11-19 10:25:09 -08:00

res

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

tests

am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread

2010-11-24 13:29:56 -08:00