| commit | c2ded769c62dc6cbe74ab6aa3ebe8812e839d179 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Thu Jul 22 20:22:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 20:22:57 2021 +0000 |
| tree | d0b9493614053a5ac88a2cb2c94b219bcb6257eb | |
| parent | 85b38729a8d6af7bf0b996d519fc3e4e4e6cfdc3 [diff] | |
| parent | 72784deb3f3489ced9e0b7eb3c82549d2a878fe2 [diff] |
[automerger skipped] Merge "resolve merge conflicts of b6347c9d4876378a0868f0cae9b6f613387e6d1d to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 72784deb3f -s ours am skip reason: Merged-In Id49bae33438e10248bef05450d7e2c92c2140748 with SHA-1 2cc564c647 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15360680 Change-Id: I6b3ed00829f54146e65d2dc34ed2227720caf62c