tree 0f0fc4a9584a400f9d8c524e1ab7dcbe93086973
parent 59ee2ed28b222f7f3abbf9452e4a05b14cde969a
parent aec90be6314a497c6e9ca2c6f3568dd921aeafdb
author Xin Li <delphij@google.com> 1614079841 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614079841 +0000

[automerger skipped] Merge ab/7061308 into stage. am: d7927e46dc -s ours am: 6b965bbd7f -s ours am: aec90be631 -s ours

am skip reason: Change-Id Ib590035a7b3f124b2a767279623d51bc8c0dbd18 with SHA-1 dc0b212582 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f0093cb1325c4ad83bdea43d2f9c8d58386be51