Eric Laurent d7b92a0ff3 resolved conflicts for merge of 61bb25f2 to master

2010-02-11 10:38:28 -08:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

Remove in-app to global search toggle. Bug: 2436539

2010-02-11 07:29:45 -08:00

jni

remove android.os.Base64Utils

2010-02-08 12:27:07 -08:00

res

resolved conflicts for merge of 61bb25f2 to master

2010-02-11 10:38:28 -08:00

tests/coretests

Merge "suppress broken tests(http://b/2431671)"

2010-02-09 14:07:43 -08:00