tree 02929cce4d110a05743d6a1ca9108dd092df95b4
parent d226e0a2cc5048884ff4fb9f6ed958099cacd363
parent 83f111d129fcb8c50b35da789f0d75604b9c0864
author Jeff Sharkey <jsharkey@android.com> 1242091610 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242091610 -0700

am 83f111d: Prevent race condition when cancelling long-press for scroll

Merge commit '83f111d129fcb8c50b35da789f0d75604b9c0864'

* commit '83f111d129fcb8c50b35da789f0d75604b9c0864':
  Prevent race condition when cancelling long-press for scroll.