Merge "Fix for drag start event being incorrectly cached" into nyc-dev

am: 26903a3431

* commit '26903a34317a3137b49ed405e1388ec6f44f1f40':
  Fix for drag start event being incorrectly cached

core/java/android/view/ViewGroup.java

@@ -1382,6 +1382,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
             if (mIsInterestedInDrag) {
                 retval = true;
             }
+
+            if (!retval) {
+                // Neither us nor any of our children are interested in this drag, so stop tracking
+                // the current drag event.
+                mCurrentDragStartEvent.recycle();
+                mCurrentDragStartEvent = null;
+            }
         } break;
 
         case DragEvent.ACTION_DRAG_ENDED: {