Merge "Small cleanup"

java/src/com/android/inputmethod/latin/Constants.java

@@ -208,6 +208,7 @@ public final class Constants {
         case CODE_ACTION_NEXT: return "actionNext";
         case CODE_ACTION_PREVIOUS: return "actionPrevious";
         case CODE_LANGUAGE_SWITCH: return "languageSwitch";
+        case CODE_SHIFT_ENTER: return "shiftEnter";
         case CODE_UNSPECIFIED: return "unspec";
         case CODE_TAB: return "tab";
         case CODE_ENTER: return "enter";

java/src/com/android/inputmethod/latin/LatinIME.java

@@ -1639,7 +1639,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             }
             final int wordComposerSize = mWordComposer.size();
             // Since isComposingWord() is true, the size is at least 1.
-            final int lastChar = mWordComposer.getCodeBeforeCursor();
             if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {
                 // If we are in the middle of a recorrection, we need to commit the recorrection
                 // first so that we can insert the batch input at the current cursor position.