Brian Muramatsu 6eb7128c9c Merge remote branch 'goog/gingerbread' into honeycomb ...

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tests/tests/app/src/android/app/cts/DownloadManagerTest.java

Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1

2011-10-07 11:14:08 -07:00

..

src/android/net

Merge remote branch 'goog/gingerbread' into honeycomb

2011-10-07 11:14:08 -07:00

Android.mk

Change CTS tests to not build against SDK.

2009-09-11 15:31:30 -07:00

AndroidManifest.xml

Revert "Change cts tests to use InstrumentationTestRunner."

2009-05-19 18:08:05 -07:00