Merge branch 'cm-11.0' of git://github.com/faleandroid/android_packages_apps_Settings-1 into cm-11.0

Conflicts:
	res/values-af/cm_caf.xml
	res/values-ca/cm_caf.xml
	res/values-da/cm_caf.xml
	res/values-de/cm_caf.xml
	res/values-de/cm_strings.xml
	res/values-es-rXA/cm_caf.xml
	res/values-es/cm_caf.xml
	res/values-iw/cm_caf.xml
	res/values-ja/cm_strings.xml
	res/values-nl/cm_caf.xml
	res/values-pt-rBR/cm_caf.xml
	res/values-ru/cm_strings.xml
	res/values-ru/cr_strings.xml
	res/values-sr/cm_strings.xml
	res/values-tr/cm_caf.xml
	res/values-zh-rCN/cm_caf.xml
	res/values/cm_strings.xml
	res/values/cr_strings.xml
	src/com/android/settings/quicksettings/QuickSettingsUtil.java

Change-Id: Id14538bc826d95611d95fa9316e570b672acf1f1