Merge commit 'daf88d35e72e754a96bf5940d5374038faf87b43' into HEAD

* commit 'daf88d35e72e754a96bf5940d5374038faf87b43':
  Move the Serbian keyboard and strings to the correct folder.

Conflicts:
Merge commit '222c9019e75b8cdb08a8c040d9bcdd93031dbe52' into HEAD

* commit '222c9019e75b8cdb08a8c040d9bcdd93031dbe52':
  Add a key to the keyboard layout for Russia

Conflicts:
	java/res/layout/input2.xml
	java/res/layout/input3.xml
	java/res/xml-ru/kbd_qwerty_black.xml
	java/res/xml/dictionary.xml
	java/src/com/android/inputmethod/latin/LatinIME.java
Merge (-sours) commit '9c76844da2c8b8fb7ac2db5279d74f9e4fd5c629' into HEAD

* commit '9c76844da2c8b8fb7ac2db5279d74f9e4fd5c629':
  Fix NPE on logging words
Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/inputmethods/LatinIME into upstream-2.3.5

Conflicts:
	java/res/values-zh-rTW/strings.xml
	java/src/com/android/inputmethod/latin/InputLanguageSelection.java

Change-Id: I55b8626d8f5afc6aedddccdd3822497540a1fdb5
add missing languages to whitelist introduced in 2.3.5

Change-Id: I3faef8dba8be48a6119aafcf2fd29b95c585b7a8
Delete a word by pressing shift-backspace.

Change-Id: I19360bc3cf39e90756a1399bd2f01a3a09296983
Signed-off-by: Glenn Maynard <glenn@zewt.org>
Enabled Language Keyboard

Change-Id: Ibe6cd4fdf2e6f4a36bb18b77f6f39fafd90c1638
Czech: added missing strings, fixed translation

Change-Id: Ic089e41ffea3191c23c6d9ea3cba033e6eb08a89
Update hungarian translation

Change-Id: I3f2e4f8ea9404dfda321fd7e970d131b90784f6d
Update to use system/core/include 4.2.2_r1.2
Remove LOCAL_NDK_VERSION
Remove user tag
Fix merge bfd3b8bf86273770e37499e8bcc0623e11f118cf