tree 4d795f8703769b5b046bb2f94d185b6f56f78e4f
parent 2eea42fcb99016943568baa6fe77faa23c9c32b6
parent 1e35fbbac778a973fefd2f6e0061d4ece8aeff2b
author Sunny Goyal <sunnygoyal@google.com> 1473712185 +0000
committer android-build-merger <android-build-merger@google.com> 1473712185 +0000

Merge "Using DragObject for folder drop instead of maintaining states when drag starts from inside a folder" into ub-launcher3-calgary-polish
am: 1e35fbbac7

Change-Id: I82e18807efe254f86df434dc73c94f951f041c3a