Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into 34

Conflicts:
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/NetworkStateTracker.java
	core/java/android/net/http/AndroidHttpClient.java
	core/java/android/provider/Settings.java
	core/java/com/android/internal/os/ZygoteInit.java
	core/java/com/google/android/mms/pdu/PduParser.java
	core/jni/android_net_NetUtils.cpp
	core/res/AndroidManifest.xml
	core/res/res/values-de/strings.xml
	core/res/res/values-es/strings.xml
	core/res/res/values-it/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-uk/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values-zh-rTW/strings.xml
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	data/fonts/DroidSans-Bold.ttf
	data/fonts/DroidSans.ttf
	data/fonts/DroidSansArabic.ttf
	data/fonts/DroidSansMono.ttf
	data/fonts/DroidSerif-Bold.ttf
	data/fonts/DroidSerif-BoldItalic.ttf
	data/fonts/DroidSerif-Italic.ttf
	libs/ui/InputDispatcher.cpp
	packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png
	packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png
	packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/UsbObserver.java
	telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

Change-Id: I62ec21bc0b72a4a5e989f80d61f3e7a0d4ad3d3f