tree 2d897854bbd902121bda58eb2a1950c2259af869
parent 277f26c4f1af65552588bd5383971ef053bfc492
parent 910e895a99ffa29d23259079ed29dc1bf26bcc71
author Zak Cohen <zakcohen@google.com> 1591245540 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591245540 +0000

Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99

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

Change-Id: I47e2ae41a374111d922ef24a9df31e97f23c69e5