-b master 2eac99ccbc resolved conflicts for merge of d6fe243c to master

2009-07-07 22:55:28 -07:00

..

etc

AI 144949: remove Maps

2009-04-08 00:38:40 -07:00

res

resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07:00

src/com/android/providers/settings

resolved conflicts for merge of d6fe243c to master

2009-07-07 22:55:28 -07:00

Android.mk

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

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

AndroidManifest.xml

Make backup agent run in the system process as well.

2009-07-06 14:47:30 -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