| commit | e6286866f56e9cc11c9015b06d3134a1c73f613c | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Jun 15 01:17:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 01:17:11 2021 +0000 |
| tree | 510c631c0dbcfefffa744030e0f3eef9172bc55b | |
| parent | 53d761f63c273d4d285c2a3b4600e5cb584f76ae [diff] | |
| parent | ce4397aafee8fa8f59fafafd9df9188865458d94 [diff] |
Merge "resolve merge conflicts of 11bf817e86c669e820d8a63fd82bad654f2203ab to sc-v2-dev" into sc-v2-dev am: ce4397aafe Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969495 Change-Id: Ie542d77f88c224984472d52eede2bcc80b797f84