Merge commit '59d271ee763efac79c07e8224490e3755284e603' into HEAD

Napodan : this commit was backported the 2010-08-20 : 979f8690967ff5409fe18f5085858ccdb8e0ccf1

* commit '59d271ee763efac79c07e8224490e3755284e603':
  Add key debounce.  bug: 2517112
Merge (-sours) commit 'a86a942d7c95c1ab1225f705f712383258b4d614' into HEAD

* commit 'a86a942d7c95c1ab1225f705f712383258b4d614':
  Fix the mic icon key is not black in the black scheme.
Merge commit 'ac108d5b341f484d48009ba0e90524569bab84f2' into HEAD

* commit 'ac108d5b341f484d48009ba0e90524569bab84f2':
  Null check at BackToAcceptedDefault
Merge (-sours) commit 'bc0b0a6478d97874e305be60bfa16798268edc2a' into HEAD

* commit 'bc0b0a6478d97874e305be60bfa16798268edc2a':
  Show preview of F1 keys properly
Merge (-sours) commit '09ecdc8bd653ed47a00fb1de7f3375cb73353f83' into HEAD

* commit '09ecdc8bd653ed47a00fb1de7f3375cb73353f83':
  Disable re-editting feature.
Merge (-sours) commit '2941dc28d7ba203d9b5009b9bcb0d3b38a83bd93' into HEAD

* commit '2941dc28d7ba203d9b5009b9bcb0d3b38a83bd93':
  Change version
Merge (-sours) commit 'b71547f2d065a17b268d1dbc896daab1820141a6' into HEAD

* commit 'b71547f2d065a17b268d1dbc896daab1820141a6':
  Fix some bugs in editing feature
Merge (-sours) commit '937d5ad0131267aa4273f3e5d75b203a1f263c18' into HEAD

* commit '937d5ad0131267aa4273f3e5d75b203a1f263c18':
  added bigram prediction   - after first character, only suggests bigram data (but doesn't autocomplete)   - after second character, words from dictionary gets rearranged by using bigram   - compatible with old dictionary   - added preference option to disable bigram
Merge commit '2a118d844e0b7dd3e01f25e937b02b05711768a6' into HEAD

* commit '2a118d844e0b7dd3e01f25e937b02b05711768a6':
  Unbundle LatinIME
Merge (-sours) commit '7ff4da9489df0cc8fffce390a42510b4cfb86549' into HEAD

* commit '7ff4da9489df0cc8fffce390a42510b4cfb86549':
  Fix build failure by adding an input
Merge (-sours) commit 'f73907ab5aeba9e45100282b4b3c40c5853c6e01' into HEAD

* commit 'f73907ab5aeba9e45100282b4b3c40c5853c6e01':
  Change version to 0.21
Merge (-sours) commit 'f336adc4bffa9c522a4d66077e1f4e71bda48b3b' into HEAD

* commit 'f336adc4bffa9c522a4d66077e1f4e71bda48b3b':
  Comment out re-editing feature
Merge commit '30ce6f0530d125309da3fd28d24cc1f74419f74e' into HEAD

* commit '30ce6f0530d125309da3fd28d24cc1f74419f74e':
  Fix sim build
Merge (-sours) commit '8b96a9a238875767a46400902006540cb54f8d9b' into HEAD

* commit '8b96a9a238875767a46400902006540cb54f8d9b':
  Underlining for correction is causing problems with styled text. Disable for now.
Merge commit 'cbd4592fe1f2bce822044099246709f7802d5aa8' into HEAD

* commit 'cbd4592fe1f2bce822044099246709f7802d5aa8':
  Add JNI_H_INCLUDE directory to LOCAL_C_INCLUDES to be able to build under source tree
  Merge English bigram dictionary to the sandbox: https://android-git.corp.google.com/g/#change,56796
Merge (-sours) commit '353c20a62ffe9b21b4efa9a6d3be2c1492e6ab83' into HEAD

* commit '353c20a62ffe9b21b4efa9a6d3be2c1492e6ab83':
  Slightly reluctant to scroll candidate strip to be able to easily choose the suggestion
Merge (-sours) commit 'e04cc8b826a8d77c62b4377beaa7ba8879f9551e' into HEAD

* commit 'e04cc8b826a8d77c62b4377beaa7ba8879f9551e':
  Change the name of the application to Latin Keyboard
Merge commit '91d96f2a64ddb2853122746cb9ce3f6fa14eaf8b' into HEAD

* commit '91d96f2a64ddb2853122746cb9ce3f6fa14eaf8b':
  Add xlarge resources
Merge commit 'debd74c67871e8ede5a1338a053da352e41243c8' into HEAD

* commit 'debd74c67871e8ede5a1338a053da352e41243c8':
  Prepare for master merge - Rename the jni library name - Revert the local cert - LatinIme2Google -> LatinIME Please note that we'll use the new package name: com.google.android.inputmethod.latin

Conflicts:
	java/AndroidManifest.xml
	native/Android.mk
Merge (-sours) commit '7df1c4e6c99c2b3d87e8f860978141948980bbc2' into HEAD

* commit '7df1c4e6c99c2b3d87e8f860978141948980bbc2':
  Change the default vaule of Log to be false