Suchi Amalapurapu e1fae30e20 Merge commit '0781df94' into manualmerge ...

Conflicts:
	Android.mk
	api/current.xml

2009-06-17 18:24:44 -07:00

..

MockApplication.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MockContentProvider.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

MockContentResolver.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MockContext.java

Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.

2009-06-11 11:29:57 -07:00

MockDialogInterface.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

MockPackageManager.java

Merge commit '0781df94' into manualmerge

2009-06-17 18:24:44 -07:00

MockResources.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00