tree ef2dc6e4243e7a18ee7887c5e837802f54531f48
parent c32d5abe60bb8d212444da4ab2ec3e72e686cf9f
parent 8f87845a6a57f81a0dfc68df919d8bb639745ff5
author Sunny Goyal <sunnygoyal@google.com> 1504120840 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1504120840 +0000

Merge changes from topic "am-f8cfbb03-ab08-49c2-b587-0dcf40840504" into ub-launcher3-master

* changes:
  [automerger] Fix bug where dragging app from Search breaks Folder preview. am: 4f59381bc4
  Fix bug where dragging app from Search breaks Folder preview.