tree 042474174b01225a0e983fc18fe5ee17c82a1358
parent 5f4d130d87e42e9ddac4d3b9ea0b22625b181b13
parent d0d495f5083b5acf93a3de9b28e87d7dcad8f6f4
author Sunny Goyal <sunnygoyal@google.com> 1473284930 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1473284930 +0000

Merge "Preventing concurrentmodification exception when dragging a icon with shortcuts from inside a folder" into ub-launcher3-calgary-polish