| commit | 2aac1034776dbfd298ee5f038506a02a7901cf57 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 25 16:28:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 25 16:28:02 2021 +0000 |
| tree | c4d6b3e58a75e2a8d685b87706cdd92b577c481d | |
| parent | e6d26322d1b1c287ba08a7aee34fbde19ba79883 [diff] | |
| parent | 3e86b02d55d1fb9093cd4e2adf8ee1c9a56afce7 [diff] |
[automerger skipped] Merge "resolve merge conflicts of a754e678a7a2fddfa716783f8c5f2fc99da68973 to sc-v2-dev" into sc-v2-dev am: 3e86b02d55 -s ours am skip reason: Merged-In I95a80b484516f634fa13347534810c7a51cecc8d with SHA-1 8bdb222a18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098711 Change-Id: I6c1a641c9573b6ad6e7105381a3b75905af6ded6