tree 757b77641b5f3f2c9a87b3f84f36de3cc69337a2
parent 624d25e841aeab14d1e818bbe7060608dd8443d5
parent 3e7267762d05b174aefbbb518876a5ac0e3d5ef1
author Bill Yi <byi@google.com> 1600498876 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600498876 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 41e7da247f am: f6c4952bcc -s ours am: 3e7267762d -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: I25c4f70be5a2e7bd4809c32e20ff3559c3cd3cfd