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

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

Change-Id: Ia01ea3b8e1073ecc9477f85be1cc2469c5a18760

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