Jim Miller 3ecd3624d5 am 86103cd7: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp ...

Merge commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74'

* commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74':
  resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 01:02:27 -08:00

..

assets

Fix the youtube placeholder.

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

res

am 86103cd7: resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

2009-11-18 01:02:27 -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

…

NOTICE

…