tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 978ea3c592d9c12074aeaa5a917443c915a2ad18
parent f972bf0617d1f2f5b151b048921035e792afa60a
author Sunny Goyal <sunnygoyal@google.com> 1422685320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685320 +0000

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

* commit 'f972bf0617d1f2f5b151b048921035e792afa60a':