tree 78b540ed56e418a8a0b6bcc9f6c8e401abd2cbd4
parent 94c5c705fae71add20b6faf04f1c0dd2d6543cba
parent bf3706f01e9a1a6c167f39c744ff4001e325c7fa
author Sunny Goyal <sunnygoyal@google.com> 1409275631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409275631 +0000

am bf3706f0: am 83acc755: Merge "Clear the draginfo object once the item is dropped inside a folder" into ub-now-porkchop

* commit 'bf3706f01e9a1a6c167f39c744ff4001e325c7fa':
  Clear the draginfo object once the item is dropped inside a folder