tree 0e97277f75fa6e84dd804e9879ad33a23ec31d9e
parent 0f6b41c6a15e23ddf30e20ea0791facdb241c2d3
parent f9ae233be1532f83c59bcb99508ebe75e1b78f00
author Grace Kloba <klobag@google.com> 1267478206 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267478206 -0800

am 3ca122df: am cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2

Merge commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8'

* commit '3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8':
  If we get TOUCH_UP before getting the WebCore's