Mathias Agopian 5fbcaf9a90 Merge commit 'goog/master' into merge_master

2009-06-01 14:30:08 -07:00

..

assets

Automated import from //branches/master/...@141533,141533

2009-03-24 20:29:58 -07:00

res

Merge commit 'goog/master' into merge_master

2009-06-01 14:30:08 -07:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

AndroidManifest.xml

am 162c9d0e: Merge change 2805 into donut

2009-06-01 10:01:08 -07: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