Merge 20121118

Conflicts:
	core/java/android/app/ActivityThread.java
	core/java/android/app/ContextImpl.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/Configuration.java
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/SystemServer.java

Conflicts:
	core/java/android/app/ActivityThread.java
	core/java/android/app/ContextImpl.java
	core/java/android/content/ContentProvider.java
	core/java/android/content/res/AssetManager.java
	core/java/android/content/res/Configuration.java
	core/java/android/content/res/Resources.java
	core/java/android/util/DisplayMetrics.java
	core/java/android/util/ExtendedPropertiesUtils.java
	core/java/android/view/DisplayInfo.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	preloaded-classes
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityStack.java