Merge branch 'gingerbread' of git://git.omapzoom.org/platform/frameworks/base into 237

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/bluetooth/BluetoothDeviceProfileState.java
	core/java/android/content/pm/IPackageManager.aidl
	core/res/res/values-de/strings.xml
	core/res/res/values-sk/strings.xml
	core/res/res/values-sv/strings.xml
	core/res/res/values-zh-rTW/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java
	services/java/com/android/server/NativeDaemonConnector.java
	services/java/com/android/server/PackageManagerService.java
	services/java/com/android/server/WifiService.java
	telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeInflater.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParser.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java
	tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java
	wifi/java/android/net/wifi/WifiStateTracker.java

Change-Id: Ia721284ebd8ed7741ab55105d89f2e3f366604d7