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

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/layout/data_usage_cycle_editor.xml
	res/values-af/cm_arrays.xml
	res/values-ca/cm_arrays.xml
	res/values-ca/cm_strings.xml
	res/values-cs/cm_arrays.xml
	res/values-cs/cm_strings.xml
	res/values-da/cm_arrays.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_arrays.xml
	res/values-de/cm_strings.xml
	res/values-el/cm_arrays.xml
	res/values-el/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-it/cm_arrays.xml
	res/values-it/cm_plurals.xml
	res/values-it/cm_strings.xml
	res/values-iw/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nl/cm_arrays.xml
	res/values-nl/cm_strings.xml
	res/values-pt-rBR/cm_arrays.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-ru/cm_arrays.xml
	res/values-tr/cm_arrays.xml
	res/values-tr/cm_strings.xml
	res/values-uk/cm_strings.xml
	res/values/arrays.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/colors.xml
	res/values/config.xml
	res/xml/button_settings.xml
	res/xml/device_info_settings.xml
	res/xml/display_settings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pin.xml
	res/xml/settings_headers.xml
	res/xml/sound_settings.xml
	res/xml/status_bar.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/cmstats/ReportingService.java
	src/com/android/settings/cyanogenmod/ButtonSettings.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/MemoryManagement.java
	src/com/android/settings/cyanogenmod/PrivacySettings.java
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/cyanogenmod/SystemUiSettings.java