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