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.
tree: 02929cce4d110a05743d6a1ca9108dd092df95b4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE