am 4e6e0ace: am 1a7cfd67: Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev

* commit '4e6e0ace3309d74b582e2d18e7df5e788beeb5da':
  Fix for the clearing of fling events
diff --git a/core/java/android/view/SimulatedTrackball.java b/core/java/android/view/SimulatedTrackball.java
index 88cc74f..1878e28 100644
--- a/core/java/android/view/SimulatedTrackball.java
+++ b/core/java/android/view/SimulatedTrackball.java
@@ -132,7 +132,7 @@
                 mLastMoveX = 0;
                 mLastMoveY = 0;
                 // Clear any flings
-                mHandler.removeMessages(0);
+                mHandler.removeMessages(FLICK_MSG_ID);
                 break;
             case MotionEvent.ACTION_HOVER_MOVE:
                 // Determine whether the move is slop or an intentional move