tree 83fb8ab8ae222e6bbe8ebf812477debe67aa10a3
parent ece21e957ece2298ee589f51b49c468f9e7ca56d
parent 260bdd795e79ac0bb90fdee74eea63171bf43a1d
author Bill Yi <byi@google.com> 1600676821 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600676821 +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: 260bdd795e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I305d8fa829a78824dde60a0a8fdc9340fe603d5e