commit 63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441
author Gilles Debunne <debunne@google.com> Tue Feb 08 17:31:33 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 08 17:31:33 2011 -0800
tree da3cf37228b3195e431a4ce1d56489e652fa99ce
parent e04c14962f4a1089d411e1f7fa4d1019fe723885
parent cdfe899991c365d9e197d83f8859089cae082011

am cdfe8999: Fix for multiple merge problem.

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

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 70dc8cb..05363d4 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8268,9 +8268,7 @@
         }
 
         @Override
-        public void onDetached() {
-            removeCallbacks(mHider);
-        }
+        public void onDetached() {}
     }
 
     private void hideInsertionPointCursorController() {