tree ca0159a35848abb1bbbcddbb45e9facb6a04664f
parent ebfdc30b46568409bcbb439a621cdc12ba4f5f12
parent c4a6b5cc403b6b534cbe30bc84dcd4ef69c331d8
author Xin Li <delphij@google.com> 1637272856 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637272856 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c4a6b5cc40 -s ours

am skip reason: Merged-In I40bef9eb41bfedf73ac4bd0ff0050833d2a9623c with SHA-1 447bd19ff4 is already in history

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

Change-Id: I972c43a577d6ce277f6701f240bd3d366dc85512