tree 01a53a3ba1da06595a24178e555b28c2ff3c5d40
parent 260bdd795e79ac0bb90fdee74eea63171bf43a1d
parent 83805b696cc7b79826743fa9978ebfc40b75aea9
author Bill Yi <byi@google.com> 1600502511 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502511 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 41e7da247f am: f6c4952bcc -s ours am: 3e7267762d -s ours am: 83805b696c -s ours

am skip reason: Change-Id I0631b58f00dc0c39222e538a31e570206cf546f3 with SHA-1 b634086d6c is in history

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

Change-Id: I939ef2b29e45775c3f186e2b2d46393dc8edbee8