Jim Miller f8da578ee7 resolved conflicts for merge of a442e791 to eclair-mr2-plus-aosp

2009-11-24 14:31:37 -08:00

..

config

…

java

am 2464acc6: moved the gdata library to vendor/google

2009-11-24 11:03:05 -08:00

jni

am ad431ad8: Merge change Ia3acc2ee into eclair

2009-11-22 22:02:17 -08:00

res

am 35cdb484: Merge change I6c6c166b into eclair

2009-11-24 14:04:44 -08:00