Merge branch 'cm-11.0' of https://www.github.com/CyanogenMod/android_frameworks_base into HEAD

Conflicts:
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java