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

Conflicts:
	res/values/cm_arrays.xml

Change-Id: Id566cd03bd6eb2f9a3599aef544198615896d3a9
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Change-Id: I0c6e4f8b9620a4c66659809c1e4f09ac08f84ef4
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	src/com/android/settings/cyanogenmod/SystemUiSettings.java

Change-Id: I9129be0db5478d3cf9c7e1d533c5d1683f4d7f07
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/xml/performance_settings.xml
	src/com/android/settings/cyanogenmod/PerformanceSettings.java

Change-Id: Ie52a7dda86cc9eaa6875bf51556aef8c29707842
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_strings.xml

Change-Id: Iadfa4ee9cf3142dcc20a3ea97c258519caf26a70
Settings: CS translation - AOSP

- fix for AOSP string

Change-Id: Iec22ddcbcc44b80a608912965f1f8244c8a8bdc5