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

Signed-off-by: houst0nn <houstonn@gmail.com>

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

Change-Id: I586359a16b2a478066d8e040a6f70138e51ae8f5