tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent e0ff1ed6f4541a0ade80036058a0c91925708b80
parent b5b28f9110208854e0a511f5ca85a2158ee6bb64
author Sunny Goyal <sunnygoyal@google.com> 1422669699 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669699 +0000

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

* commit 'b5b28f9110208854e0a511f5ca85a2158ee6bb64':