tree c0296b587f1ef634f7922e06350f1993e00875ef
parent cf2f085d23eebbf45de4f26fa1018226001161b8
parent 82122082364ee808d495ca53a26e85a05c3cf4c7
author Xin Li <delphij@google.com> 1637274313 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637274313 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: c4a6b5cc40 -s ours am: 8212208236 -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: Iecf89d176771c037f7f1bbf0b4f7cbe43d67a029