tree 9997a8618cc6811542917cf1a486e8ed18771c43
parent 79a3560f5c2371d50944fc0ad7be6a453fae47fe
parent 7112d5dbdf1861227499ecb509b1a12343215f92
author Winson Chung <winsonc@google.com> 1336553734 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553734 -0700

am 7112d5db: Merge "Do not defer removing the drag view if we don\'t animate the item back into the folder. (Bug 6249514)" into jb-dev

* commit '7112d5dbdf1861227499ecb509b1a12343215f92':
  Do not defer removing the drag view if we don't animate the item back into the folder. (Bug 6249514)