Mathias Agopian 0179ff6594 Merge commit 'goog/master' into master_gl ...

Conflicts:
	libs/utils/Parcel.cpp

2009-04-10 14:36:33 -07:00

..

assets

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

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

res

Merge commit 'goog/master' into master_gl

2009-04-10 14:36:33 -07:00

Android.mk

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

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

AndroidManifest.xml

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

2009-03-25 15:09:04 -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