Merge branch 'upstream/cm-11.0'

Signed-off-by: Almite <almite@hotmail.com>

Conflicts:
	res/values/cm_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java