tree a839131f7638ea434cf24d485ebdde89faa9310b
parent 6ca4b41b019c797bc88722eebe1e97f16c934797
parent 8f9830ec05ae995e23a82cbd749106083318521a
author Jon Miranda <jonmiranda@google.com> 1555549686 -0700
committer android-build-merger <android-build-merger@google.com> 1555549686 -0700

Merge "Do not draw anying in FloatingIconView if we are not hiding the original icon" into ub-launcher3-qt-dev
am: 8f9830ec05

Change-Id: Id2591053a2af61670a4c994bd4915c14b0db16fd