[2/2]Settings: Stylus Gestures

Change-Id: I9ca9fa237709a6237bbcd9ecf329bc9aa7e6321c

Conflicts:

	res/values/custom_strings.xml
	res/values/resurrection_arrays.xml
	res/xml/language_settings.xml
	src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java