tree aad949c13f34020eb21bdbfbaab2007c72495a46
parent 4613c6efb2022af23926d081784136b7acc7ef7e
parent f53278c908386a155f6d45b8c523f06fa3647f86
author Samuel Fufa <sfufa@google.com> 1634290015 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634290015 +0000

Merge "[Search] Fix ItemInfo assignment conflict" into sc-v2-dev am: f53278c908

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16059407

Change-Id: I9018f824a80a7b774fa8d57c2090a0a9dee56b0a