OSDN Git Service

am f9ed8be1: (-s ours) am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get...
authorChristopher Tate <ctate@google.com>
Mon, 4 Mar 2013 22:18:14 +0000 (22:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Mar 2013 22:18:14 +0000 (22:18 +0000)
commit2455ea0622eb722b155a07249f1a57493626f72a
treed9327dafe562219d37c847169810ab4b2e03e416
parent54fed868c80903a25955df3754998876ea279865
parentf9ed8be17da47f5003205bf1fbfc87a300de10f0
am f9ed8be1: (-s ours) am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev

* commit 'f9ed8be17da47f5003205bf1fbfc87a300de10f0':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached