tree 9997a8618cc6811542917cf1a486e8ed18771c43
parent c76b0646efe2c58fef82159461e3350f69904583
parent 2c4cf411f6c30fb2bfb47d2b13b680bda7a266dc
author Winson Chung <winsonc@google.com> 1336511834 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336511834 -0700

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