tree 6d9cd0e7fd7bbf8fd2fd83621f3edc021450e8a3
parent 3be40590c002b1b8a9dd3c5e0bfe941affac7aff
parent 910e895a99ffa29d23259079ed29dc1bf26bcc71
author Zak Cohen <zakcohen@google.com> 1591245542 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591245542 +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: I34fd11734e012a23b6263ec9a9ba7c006c9acdb4