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

Conflicts:
	core/res/res/values-es/pa_strings.xml
	core/res/res/values/pa_strings.xml
	core/res/res/values/pa_symbols.xml