Merge "Change version"
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 7612426..2cc92e1 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -711,15 +711,16 @@
         mLastSelectionEnd = newSelEnd;
 
 
+        // TODO: Uncomment this block when we enable re-editing feature
         // If a word is selected
-        if ((candidatesStart == candidatesEnd || newSelStart != oldSelStart)
+        /*if ((candidatesStart == candidatesEnd || newSelStart != oldSelStart)
                 && (newSelStart < newSelEnd - 1 || (!mPredicting))
                 && !mVoiceInputHighlighted) {
             abortCorrection(false);
             if (isCursorTouchingWord() || mLastSelectionStart < mLastSelectionEnd) {
                 postUpdateOldSuggestions();
             }
-        }
+        }*/
     }
 
     @Override