tree 01a53a3ba1da06595a24178e555b28c2ff3c5d40
parent 44150f8da42561248f7b0ff0dd9f2a30ab3ba422
parent 624d25e841aeab14d1e818bbe7060608dd8443d5
author Bill Yi <byi@google.com> 1600502460 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502460 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285ba am: 9e0e0fb05f -s ours am: f4c1bd2cb7 -s ours am: 624d25e841 -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: Ic64fe07e8481a683a1b599a3f7f944adc3b40097