Hybrid 2.0

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/provider/Settings.java
	graphics/java/android/graphics/Bitmap.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
	preloaded-classes
	services/java/com/android/server/SystemServer.java
	services/java/com/android/server/am/ActivityStack.java

Fix double IME on tabui

Also restore back our lovely "isTablet" getter :)

Conflicts:
	core/java/android/util/ExtendedPropertiesUtils.java
	services/java/com/android/server/InputMethodManagerService.java

Fix isTablet() method

Hybrid 2.0

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

Change-Id: I5a7efccefd681ffdf0457c8ca87826a5767587df

Conflicts:
	core/java/android/app/Activity.java
	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/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/java/android/util/ColorUtils.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/quicksettings/HybridTile.java
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavbarEditor.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/view/PieMenu.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
	services/java/com/android/server/InputMethodManagerService.java
	services/java/com/android/server/am/ActivityStack.java