Eric Laurent 777db0c08a Merge "resolved conflicts for merge of 61bb25f2 to master"

2010-02-11 11:16:36 -08:00

..

assets

Fix the youtube placeholder.

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

res

resolved conflicts for merge of 61bb25f2 to master

2010-02-11 10:38:28 -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

Eliminate dependencies on Checkin, replacing checkin events with EventLog

2010-02-11 10:22:09 -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