Jean-Baptiste Queru dd03c6135f resolved conflicts for merge of 081a136d to eclair

2009-08-21 12:59:04 -07:00

..

assets

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

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

res

resolved conflicts for merge of 081a136d to eclair

2009-08-21 12:59:04 -07:00

Android.mk

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

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

AndroidManifest.xml

am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode

2009-08-18 11:00:16 -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