Brian Muramatsu e704a78bf7 Merge remote branch 'goog/gingerbread' into manualmerge ...

Conflicts:
	tests/tests/app/src/android/app/cts/InstrumentationTest.java
	tests/tests/content/src/android/content/cts/ContextTest.java
	tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
	tests/tests/util/src/android/util/cts/EventLogTest.java
	tests/tests/view/src/android/view/cts/WindowTest.java
	tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
	tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
	tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
	tools/host/src/com/android/cts/TestDevice.java

Change-Id: Ic4ee072b6c82f97ba256b25a71db153195c958b9

2011-03-31 15:29:51 -07:00

..

src/android/net

Merge remote branch 'goog/gingerbread' into manualmerge

2011-03-31 15:29:51 -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