Eric Laurent 777db0c08a Merge "resolved conflicts for merge of 61bb25f2 to master"

2010-02-11 11:16:36 -08:00

..

config

…

java

New implementation of <original-package> tag.

2010-02-11 11:04:49 -08:00

jni

remove android.os.Base64Utils

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

res

Merge "resolved conflicts for merge of 61bb25f2 to master"

2010-02-11 11:16:36 -08:00

tests/coretests

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

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