tree 464d016464e3ddf16663f3c75e9549f1e7808a64
parent e8cc8d5398ab5e45b22beda06973f300a69bb9a3
parent d7927e46dc33c6f0ebc89932f36120a6cbcf8afa
author Xin Li <delphij@google.com> 1614071104 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614071104 +0000

[automerger skipped] Merge ab/7061308 into stage. am: d7927e46dc -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: I7c95710f428c920c0c43d7cea1429224b86c63cc