tree 4ef691bf2313d7f1ef3b2dd3ae0bc069178666f4
parent 950a0ab73c5ba8d4928512b169e357809419f8e8
parent 27d10940d277617c5eac0648aee2a3a41099a5f9
author Sunny Goyal <sunnygoyal@google.com> 1473285468 +0000
committer android-build-merger <android-build-merger@google.com> 1473285468 +0000

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

Change-Id: I71319a1c73da63640370508b17cb6c7fab4a223e