am cdfe8999: Fix for multiple merge problem.

* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.

core/java/android/widget/TextView.java

@@ -8268,9 +8268,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
 
         @Override
-        public void onDetached() {
+        public void onDetached() {}
-            removeCallbacks(mHider);
-        }
     }
 
     private void hideInsertionPointCursorController() {