Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/Settings.java

Change-Id: Ie95d68eee7e877dc269c4a26d7279fc9379ed2d6
add option to force high-end graphics on low memory devices

Change-Id: I34e0d7381615485b58385abed743e01f7272772d

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/PerformanceSettings.java
merge derp: missing comma

Change-Id: I2d4645c971358a9e8d6481eaa68ad748285465af
Merge remote-tracking branch 'PA/kitkat' into remix-legacy