Merge commit 'ed5d613e36d1a67b572c08c19147bded916e2f67' into HEAD

* commit 'ed5d613e36d1a67b572c08c19147bded916e2f67':
  Add versionCode and versionName.  versionCode needs to be incremented to keep the unbundled LatinIME even after the reboot.
Merge (-sours) commit 'db8dcd8b024202a131f5ebbf2b685972b044dda1' into HEAD

* commit 'db8dcd8b024202a131f5ebbf2b685972b044dda1':
  Only use fullscreen mode if the number of inches in height is less than 2.5in
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