tree 8611ec3f382de8dfffb9e6c99fa3db64650615b5
parent f5f7bf9c9c265678583de32ded296c63f607aab3
parent 78d86beee294b38f5b00e8ac597ac6b0d9ebd193
author Treehugger Robot <treehugger-gerrit@google.com> 1628196437 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628196437 +0000

[automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7 am: 179b769682 -s ours am: 53228df2ac -s ours am: 78d86beee2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic90d24c0c37dfec6fab85668962ea8ffd94cfd1f