Merge branch 'cm-11.0' into stable/cm-11.0

Conflicts:
	res/values-af/cm_strings.xml
	res/values-ar/cm_strings.xml
	res/values-ca/cm_strings.xml
	res/values-cs/cm_strings.xml
	res/values-da/cm_strings.xml
	res/values-de/cm_strings.xml
	res/values-es-rXA/cm_strings.xml
	res/values-es/cm_strings.xml
	res/values-fr/cm_strings.xml
	res/values-hu/cm_strings.xml
	res/values-in/cm_strings.xml
	res/values-it/cm_strings.xml
	res/values-iw/cm_strings.xml
	res/values-ja/cm_strings.xml
	res/values-ku/cm_strings.xml
	res/values-lt/cm_strings.xml
	res/values-nb/cm_strings.xml
	res/values-nl/cm_strings.xml
	res/values-pl/cm_strings.xml
	res/values-pt-rBR/cm_strings.xml
	res/values-pt-rPT/cm_strings.xml
	res/values-sk/cm_strings.xml
	res/values-sr/cm_strings.xml
	res/values-sv/cm_strings.xml
	res/values-th/cm_strings.xml
	res/values-tr/cm_strings.xml
	res/values-zh-rCN/cm_strings.xml
	res/values-zh-rHK/cm_strings.xml
	res/values-zh-rTW/cm_strings.xml
	res/xml/more_device_settings.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/cyanogenmod/MoreDeviceSettings.java

Change-Id: I7a95da972989be79b2a750275a6075dc92c2adc4