tree 139f6b2ee2cf710992da386c3eccd8c1de8f4a03
parent 84a1476e00c3abb99f0b8efb671c8bdef985386a
parent dab85aa7274a1aa37a3384f70780fdaa034b7ae5
author Adam Cohen <adamcohen@google.com> 1321938465 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938465 -0800

am dab85aa7: am 026df005: Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1

* commit 'dab85aa7274a1aa37a3384f70780fdaa034b7ae5':
  Fixing bug where drag would sometimes get cancelled inadvertently