Dan Egnor d021302134 resolved conflicts for merge of f6bb01b0 to master

2009-12-11 14:55:24 -08:00

..

assets

Fix the youtube placeholder.

2009-10-12 12:52:33 -04:00

res

resolved conflicts for merge of f6bb01b0 to master

2009-12-11 14:55:24 -08:00

Android.mk

Explicitly specify that online-sdk depends on framework-res. (do not merge)

2009-11-04 16:04:26 -08:00

AndroidManifest.xml

am 5886050f: Merge change I0d8f7593 into eclair

2009-12-02 05:26:12 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…