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

PS2: fix merge derp

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I1b058750e91bb5e41dd70a7796278e20d5618436