tree fe7b5f618fec07b82c643eed138e46a5adde767a
parent 8dec5b359ef90cbd9855d7f20fe0052d57d48999
parent 38e35f9a12a854509a33368a1b94ef6c5af93722
author Bill Yi <byi@google.com> 1600120251 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600120251 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: ac8fa29053 -s ours am: 38e35f9a12 -s ours

am skip reason: Change-Id I451c2ec603e6d3a00228726c894056a2be78dcf3 with SHA-1 2cb1e6bcda is in history

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

Change-Id: I67de3b8e589f4eac4d49e2f879f8154eb7c25112