tree 49962bd5f91db9a373c4dc823ac23e135107d4d9
parent 3896f0bbf01c77cc505e38bef5ef11ff1c97a8d5
parent 22310b100c23a68e8f5c15e75bb224c961b75a1e
author Schneider Victor-tulias <victortulias@google.com> 1622170732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622170732 +0000

resolve merge conflicts of 694b667138085cc07e8c6cc50167e34788a0ba90 to sc-dev-plus-aosp am: 1ba3704c5f am: 22310b100c

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

Change-Id: Idf0dbcad594574cd251cd4986f00b3a65cd75549