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

Conflicts:
	res/values-af/cm_caf.xml
	res/values-af/cm_strings.xml
	res/values-ar/cm_arrays.xml
	res/values-ar/cm_caf.xml
	res/values-ar/cm_strings.xml
	res/values-ca/cm_caf.xml
	res/values-ca/cm_strings.xml
	res/values-cs/cm_caf.xml
	res/values-cs/cm_strings.xml
	res/values-da/cm_caf.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_caf.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_caf.xml
	res/values-el/cm_strings.xml
	res/values-es-rXA/cm_caf.xml
	res/values-es-rXA/cm_strings.xml
	res/values-es/cm_caf.xml
	res/values-es/cm_strings.xml
	res/values-fi/cm_caf.xml
	res/values-fi/cm_strings.xml
	res/values-fr/cm_caf.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_arrays.xml
	res/values-hu/cm_caf.xml
	res/values-hu/cm_strings.xml
	res/values-it/cm_caf.xml
	res/values-it/cm_strings.xml
	res/values-iw/cm_caf.xml
	res/values-iw/cm_strings.xml
	res/values-ja/cm_arrays.xml
	res/values-ja/cm_strings.xml
	res/values-lt/cm_arrays.xml
	res/values-lt/cm_caf.xml
	res/values-lt/cm_strings.xml
	res/values-nl/cm_caf.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_caf.xml
	res/values-pl/cm_strings.xml
	res/values-pt-rBR/cm_caf.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-pt-rPT/cm_caf.xml
	res/values-pt-rPT/cm_strings.xml
	res/values-ru/cm_caf.xml
	res/values-ru/cm_strings.xml
	res/values-sk/cm_caf.xml
	res/values-sk/cm_strings.xml
	res/values-sr/cm_arrays.xml
	res/values-sr/cm_caf.xml
	res/values-sr/cm_strings.xml
	res/values-sv/cm_arrays.xml
	res/values-sv/cm_caf.xml
	res/values-sv/cm_strings.xml
	res/values-tr/cm_caf.xml
	res/values-tr/cm_strings.xml
	res/values-zh-rCN/cm_caf.xml
	res/values-zh-rCN/cm_strings.xml
	res/values-zh-rHK/cm_arrays.xml
	res/values-zh-rHK/cm_caf.xml
	res/values-zh-rHK/cm_plurals.xml
	res/values-zh-rHK/cm_strings.xml
	res/values-zh-rTW/cm_strings.xml
	res/xml/device_info_settings.xml
	res/xml/display_settings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/quick_settings_panel.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Change-Id: Ia9ecfccd459622dc153658e36fab0cd42b06006a