| commit | 22310b100c23a68e8f5c15e75bb224c961b75a1e | [log] [tgz] |
|---|---|---|
| author | Schneider Victor-tulias <victortulias@google.com> | Fri May 28 02:37:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 28 02:37:02 2021 +0000 |
| tree | fac7d14fa71d4d82be16e2ed528d940f1b5e51dd | |
| parent | e7e67f26cc3d2c411c181a72c23bf8886b5f5abe [diff] | |
| parent | 1ba3704c5f0c937bc1a0881de4c259cb9d0389e2 [diff] |
resolve merge conflicts of 694b667138085cc07e8c6cc50167e34788a0ba90 to sc-dev-plus-aosp am: 1ba3704c5f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14753367 Change-Id: Ib8467f9c2a54d55277bc57ab35ecfcd2d4022a0b