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