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
Merge branch 'hybrid2' of git://github.com/ParanoidAndroid/android_frameworks_base into jellybean

Conflicts:
	core/java/android/util/ExtendedPropertiesUtils.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

Change-Id: Idc761a69a128db03e8ab699a16604a8b990e8880