Kenny Root 8f3ff09556 Merge "resolved conflicts for merge of dd24f599 to master"

2010-02-04 14:26:40 -08:00

..

assets

Fix the youtube placeholder.

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

res

Merge "resolved conflicts for merge of dd24f599 to master"

2010-02-04 14:26:40 -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

First pass at USB Tethering.

2010-02-04 09:15:06 -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