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

Conflicts:
	res/values-ca/pa_strings.xml
	res/values-cs/pa_strings.xml
	res/values-de/pa_strings.xml
	res/values-es/pa_strings.xml
	res/values-fr/pa_strings.xml
	res/values/pa_arrays.xml
	res/values/pa_strings.xml
	res/xml/security_settings_pin.xml
	res/xml/settings_headers.xml
	src/com/android/settings/SecuritySettings.java