| commit | 610a4b2ff25ce3ff8e99cb65052e9306a41497b4 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Sat Jul 24 04:08:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 24 04:08:12 2021 +0000 |
| tree | 403d7cb932b13cceed27d3d7127813a41dae1216 | |
| parent | d4b102dbc55173ca695d5093b3c9242e1bdb4d11 [diff] | |
| parent | 831225d8347e7882eb0928b00ff68b8ea6ea87aa [diff] |
Merge "resolve merge conflicts of 6d9e8666694eeffda9b1cc3d0945c18249ebe824 to sc-v2-dev" into sc-v2-dev am: 831225d834 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15372299 Change-Id: I0d7d07cf50e5ae66d0230a1ea76b407e6f98577b