tree a63821a05f61bc59d753f626f7ab8baafaa994a7
parent 2e9193f09e94348d24364bbe0f1644bad0cecf23
parent 72f3418743fd2e920d42727440d1cf7f66a0da4f
author Brian Muramatsu <btmura@google.com> 1301606323 -0700
committer Brian Muramatsu <btmura@google.com> 1301610591 -0700

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