| commit | 124c6cf9078694ef5b46f1f6e691c00a281dbcc9 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Thu Jun 17 02:13:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 02:13:59 2021 +0000 |
| tree | 76e67c71fa9992ac3b47af4781a53eeec5bee37e | |
| parent | f1267969cb52e38ae53c487930c406272fee40e4 [diff] | |
| parent | 819a9e39be18ec003156ce106dd0e81ff933f206 [diff] |
resolve merge conflicts of 0bf000104fb16f4fd0dcbde19300a999398d428f to sc-v2-dev am: b94b6e0d3c am: 819a9e39be Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15005253 Change-Id: I0a69d768cc6f6dac46cb5ede28cf8ce6b17ff12b