Merge branch 'gingerbread' of...

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

Conflicts:
	core/java/android/content/pm/IPackageManager.aidl
	core/java/android/server/BluetoothService.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
	services/java/com/android/server/PackageManagerService.java
	telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: I254bd490297376ae8070fffcb07d4fe15afe3a8d