Merge branch 'Cyanogen/cm-11.0'

Conflicts:
	packages/SystemUI/AndroidManifest.xml
Merge branch 'Cyanogen/cm-11.0'
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Merge branch 'Cyanogen/cm-11.0'
fix issues with linked layout quicksettings (1/2)

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
fb: Fix Mismatch

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>
Merge branch 'cm-11.0' of github.com:Hellybean/android_frameworks_base into cm-11.0

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/res/values/cm_strings.xml