Merge remote-tracking branch 'refs/remotes/m/kitkat' into kitkat-legacy

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

Change-Id: Ic10ee5578018b1438ed4405ffeb24ae64803619c