tree 6d9cd0e7fd7bbf8fd2fd83621f3edc021450e8a3
parent 67feabb46ed75b4b112783c5bc49cb7dd01b1584
parent 40c8cf14d7e6baf4914de96bfc485b450a89edb2
author Zak Cohen <zakcohen@google.com> 1591246556 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591246556 +0000

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

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

Change-Id: I87009c59fc77f5eeb2846d41744411a7b44a886b