tree 33701e5d8d9a6e3c94b0011c271c8ef8086a2886
parent f439cc384243a43118fcbe7ac02a3731108b8cf9
parent c2803ec5b272c902b6ab314d782afe852163b4ff
author Jon Miranda <jonmiranda@google.com> 1556817550 -0700
committer android-build-merger <android-build-merger@google.com> 1556817550 -0700

Merge "Remove shortcuts/deepshortcuts as targets for swipe up to icon animation." into ub-launcher3-qt-dev
am: c2803ec5b2

Change-Id: I766dc2cd9dfb93062661245a92e0ba223893bd21