Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

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