tree 85b6fe1f96ab9fe77c23dd4773dc56fb01ac823f
parent c9ed2a5e468e935c7d4a6225e2d4dcf98486b690
parent 3f2f1f74e1a2a254fda49d6cb5dbdbd1dff74bc7
author Zak Cohen <zakcohen@google.com> 1591250181 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591250181 +0000

Resolve markers - Fix build break. am: 1e7b4b850f am: 910e895a99 am: 188092646c am: 3f2f1f74e1

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

Change-Id: I38570cf3b016a57000eb0067a45a9f20298babfa