tree 7003f3f89402839ea9faea1e0b6ce5e3c788e666
parent d400bd52ef2db2a6296f1ccfa9b23e23848f5b89
parent 73fef775cd3984574addba9753b72323b763867f
author Jon Miranda <jonmiranda@google.com> 1568333689 -0700
committer android-build-merger <android-build-merger@google.com> 1568333689 -0700

[automerger skipped] Merge "Ensure the icon load request matches the ItemInfo for the floating view." into ub-launcher3-qt-qpr1-dev am: 8aee0b2cb5 -s ours
am: 73fef775cd -s ours
am skip reason: change_id Ib3767ec5c2b4eb22b35e5148879e11d2c1b28e3c with SHA1 08857d2f13 is in history

Change-Id: I0c8efc866ff8a03981bc027a12b615516bd834d9