tree 8831a726c4fca9c9b69e042af7c036d3a7ee6732
parent b7c9a026359c5d13979b461b1d941c01cc2b2466
parent 026df005fbe448090eebfebeab9a3ada24e4823c
author Adam Cohen <adamcohen@google.com> 1321917265 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321917265 -0800

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

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