Merge branch 'jb-mr1-release' of...

Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/inputmethods/LatinIME into mr1

Conflicts:
	java/res/values-it/strings.xml
	java/res/values-nl/strings.xml
	java/res/xml-sw768dp/rows_east_slavic.xml
	java/res/xml/method.xml
	java/res/xml/rowkeys_east_slavic1.xml
	java/res/xml/rowkeys_east_slavic2.xml
	java/res/xml/rowkeys_qwerty3.xml
	java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
	native/jni/src/char_utils.cpp
	tools/maketext/res/values-be/donottranslate-more-keys.xml
	tools/maketext/res/values-ky/donottranslate-more-keys.xml
	tools/maketext/res/values-ru/donottranslate-more-keys.xml
	tools/maketext/res/values-uk/donottranslate-more-keys.xml
	tools/maketext/res/values/donottranslate-more-keys.xml

Change-Id: I42d999850779cb2106e59f01a19f630a4e9d519c