Kenny Root e096ddee54 resolved conflicts for merge of 33ca1f32 to master ...

Change-Id: If5344c23c4fd727c0ad684859126337de6ca1d9f

2010-01-28 13:16:19 -08:00

..

assets

Fix the youtube placeholder.

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

res

resolved conflicts for merge of 33ca1f32 to master

2010-01-28 13:16:19 -08:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-06 08:53:44 -08:00

AndroidManifest.xml

AppsOnSd feature - Add default container

2010-01-27 10:26:43 -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