Jim Miller 86103cd7db resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 00:36:32 -08:00

..

assets

Fix the youtube placeholder.

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

res

resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 00:36:32 -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

Make WRITE_GSERVICES into system-or-signature (instead of just signature),

2009-11-12 23:02:22 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00