tree 10da860fcff71886af91d082e31f0e1917926848
parent cac75a8b7797086a34e2d50b69b36d0ecad37f9b
parent bf3706f01e9a1a6c167f39c744ff4001e325c7fa
author Sunny Goyal <sunnygoyal@google.com> 1422666488 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666488 +0000

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

* commit 'bf3706f01e9a1a6c167f39c744ff4001e325c7fa':