am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1

* commit 'd732efa2972eaaa22ff921c39744ec969598bcd0':
  Revert "IME action (done, next...) correctly handled"

core/java/android/widget/TextView.java

@@ -3799,7 +3799,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     return;
                 }
             }
-
+            
             // This is the handling for some default action.
             // Note that for backwards compatibility we don't do this
             // default handling if explicit ime options have not been given,
@@ -5608,8 +5608,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                 outAttrs.extras = mInputContentType.extras;
             } else {
                 outAttrs.imeOptions = EditorInfo.IME_NULL;
-                // May not be defined otherwise and needed by onEditorAction
-                mInputContentType = new InputContentType();
             }
             if (focusSearch(FOCUS_DOWN) != null) {
                 outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;