tree 020803d23d451d1e01e7516ee2e3201a307039a2
parent 2a0d882c4d6545002cd46248499da66a5d7968e0
parent 11e78d48b05a08f2c3606eb4d30ab1385d1d9d8d
author Grace Kloba <klobag@google.com> 1267477915 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1267477915 -0800

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 'cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3' into eclair-mr2-plus-aosp

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