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

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

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