tree 43cc8809f252a631e8623a9121afa01747a716c9
parent 12f9ab62cfe0a9d400f5e3de5c87f0bfaf942294
parent 304dcde0e301c2f1a0b2bdc80ea8617930691b6e
author Winson Chung <winsonc@google.com> 1294490424 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294490424 -0800

am 304dcde0: Ensuring that we don\'t start dragging while another drag is in progress.

* commit '304dcde0e301c2f1a0b2bdc80ea8617930691b6e':
  Ensuring that we don't start dragging while another drag is in progress.