Merge branch 'multiwindow' of bitbucket.org:paranoidandroid/aosp_frameworks_base into multiwindow

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