tree beadb7d87ae5a4c02607ed2b404ee28208c18ec9
parent 26c3c64e8d45f0ab4a6738b82d009dd3fbf4a351
parent 978f16d2e3c2e24a3fb6195957899c7556bcf587
author Sunny Goyal <sunnygoyal@google.com> 1429832597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429832597 +0000

am 978f16d2: Merge "Moving item to its old position in folder if DnD is cancelled" into ub-launcher3-burnaby

* commit '978f16d2e3c2e24a3fb6195957899c7556bcf587':
  Moving item to its old position in folder if DnD is cancelled