tree 139f6b2ee2cf710992da386c3eccd8c1de8f4a03
parent 2c03f39b087a6479a411f7f5ac1dcf63695df88a
parent 21291a712821dc8d173e56d4358e68e7ce4938ea
author Adam Cohen <adamcohen@google.com> 1321938735 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938735 -0800

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

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