am cdfe8999: Fix for multiple merge problem.

* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
This commit is contained in:
Gilles Debunne
2011-02-08 17:31:33 -08:00
committed by Android Git Automerger

View File

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