Merge remote-tracking branch 'upstream/cm-11.0' into HEAD

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java