tree 772324ffb6945f197438f97abe2e96d6aa26e943
parent 872dc2aa5e0d8e0bd885f74c85e38d66109dab6a
parent 36ca57e9969ee07e3b51881b83480898d9c39e5a
author Jon Miranda <jonmiranda@google.com> 1562884993 -0700
committer android-build-merger <android-build-merger@google.com> 1562884993 -0700

Merge "Fix bug where floating icon and workspace icon visible at the same time." into ub-launcher3-qt-r1-dev
am: 36ca57e996

Change-Id: I02a41592fed57a7e554a3d84376ea7f7738f77cb