| commit | ee61dbb13a1249398a1daaed23128e6dd9b1bc48 | [log] [tgz] |
|---|---|---|
| author | Yogisha Dixit <ydixit@google.com> | Sat Jun 26 15:26:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 26 15:26:46 2021 +0000 |
| tree | 1e8d10e988e7a2a3bda968af2b29986a3dc3d11b | |
| parent | 56073c3f6ecd80a11b7df3f143cdcd6170c79567 [diff] | |
| parent | 79d95df59d989d624bedf0b83c8c48bfbbdcc467 [diff] |
Merge "resolve merge conflicts of 1491ec31c596e69954a2735f02e7948f508b41e6 to sc-v2-dev" into sc-v2-dev am: 79d95df59d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15111790 Change-Id: Iee5a7b774c705f82e13e65839c30a576b1cc21b8