tree 9092e7d01a8c6c8c52bca43a6d6f1733f1135b7a
parent 249420ef415eee3fad7635b9961caa66621973a1
parent 9851b0fced2690171cc87d48c3751e86c8c7e0ba
author Samuel Fufa <sfufa@google.com> 1634290966 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634290966 +0000

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

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

Change-Id: I48c8c30912d58120f234bd42421ea58444722cb3