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

Conflicts:
	api/current.xml
	core/java/android/content/pm/PackageParser.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/widget/TextView.java
	core/java/com/android/internal/os/BatteryStatsImpl.java
	core/res/res/drawable-mdpi/btn_check_off.png
	core/res/res/drawable-mdpi/btn_check_off_disable.png
	core/res/res/drawable-mdpi/btn_check_off_disable_focused.png
	core/res/res/drawable-mdpi/btn_check_off_pressed.png
	core/res/res/drawable-mdpi/btn_check_off_selected.png
	core/res/res/drawable-mdpi/btn_check_on.png
	core/res/res/drawable-mdpi/btn_check_on_disable.png
	core/res/res/drawable-mdpi/btn_check_on_disable_focused.png
	core/res/res/drawable-mdpi/btn_check_on_pressed.png
	core/res/res/drawable-mdpi/btn_check_on_selected.png
	core/res/res/values-ca/strings.xml
	core/res/res/values-de/strings.xml
	core/res/res/values/config.xml
	include/media/AudioSystem.h
	include/media/mediarecorder.h
	media/java/android/media/MediaRecorder.java
	media/libmedia/AudioSystem.cpp
	media/libstagefright/StagefrightMediaScanner.cpp
	media/libstagefright/rtsp/ARTSPConnection.cpp
	media/libstagefright/rtsp/ASessionDescription.cpp
	media/libstagefright/rtsp/MyHandler.h
	policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
	policy/src/com/android/internal/policy/impl/LockScreen.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java
	services/audioflinger/AudioPolicyManagerBase.cpp
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/am/ActivityManagerService.java
	test-runner/src/android/test/mock/MockPackageManager.java
	voip/java/android/net/sip/SipProfile.java
	voip/java/com/android/server/sip/SipService.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: Ia65d02a66c6206b5f4ed95c3a64e3f28a03e7329