tree 1bd588b129c1c82d780ce47f1258750d58139b20
parent 26f21d523115561e033d710cb2fcee7c2bd21ea3
parent 8aee0b2cb54df59df230df113c1c295b2ceb9d72
author Jon Miranda <jonmiranda@google.com> 1568325870 -0700
committer android-build-merger <android-build-merger@google.com> 1568325870 -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 skip reason: change_id Ib3767ec5c2b4eb22b35e5148879e11d2c1b28e3c with SHA1 08857d2f13 is in history

Change-Id: I5fd57a6dfd77bf99dd4d8fe915bbcbe5145be738