tree 2d897854bbd902121bda58eb2a1950c2259af869
parent b84818f67d0a201525f4c7d408b79c9e769ac24c
parent 1e7b4b850fc3cc141f81a053f3a0467993f11eb9
author Zak Cohen <zakcohen@google.com> 1591244867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591244867 +0000

Resolve markers - Fix build break. am: 1e7b4b850f

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

Change-Id: I828eb043cb8ca0465469f57a26da208ee82912a5