tree b2a7493b23d0a5fcec2fd33d84178ad899def068
parent 8824a5cd61eda7d4c8d181c6187c80adc975dafe
parent 3aa15f3f6b99ff38ca71e910ce64e544e30077a3
author Xin Li <delphij@google.com> 1614814619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614814619 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09b5 -s ours am: 3aa15f3f6b -s ours

am skip reason: Change-Id Icc96bfa8a3d59a19194a154baeaffaea1281af0a with SHA-1 3be35ec269 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f3a42ec8a6ddddb8572ea391431c0833b66b39