Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/DisplaySettings.java