tree 757b77641b5f3f2c9a87b3f84f36de3cc69337a2
parent 27ae39420e8178273d3b72f6553d4d9a8ebd5058
parent f4c1bd2cb7ba314053744c6ac8514008290f5af4
author Bill Yi <byi@google.com> 1600498854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600498854 +0000

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