tree 8831a726c4fca9c9b69e042af7c036d3a7ee6732
parent 049abba5a2634f37f73d2abe83906cc71b8ad3f7
parent 74c28d1a6cf13fdfa55ff9518d2b27be10d01f6e
author Adam Cohen <adamcohen@google.com> 1321917103 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321917103 -0800

Merge "Fixing bug where drag would sometimes get cancelled inadvertently" into ics-mr1