tree 6d9cd0e7fd7bbf8fd2fd83621f3edc021450e8a3
parent fcbe280fdc9a677ff99537827759718d277b856a
parent bb4cb00ff0db12062ecd89486ccc55c29a112c73
author Zak Cohen <zakcohen@google.com> 1591245557 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591245557 +0000

Resolve markers - Fix build break. am: 1e7b4b850f am: bb4cb00ff0

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

Change-Id: I720e5fc0d11926268a6d4d78eb6b9c111a837cfc