| commit | 2482a19429edd6a4052e6d7ffd4e485e66bf0aed | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 22 17:25:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 17:25:46 2021 +0000 |
| tree | aa24b6ddb47a36ebf3c7956a321ce67ba1c5a320 | |
| parent | 841fc730ef2b5deb841ff5173e4ff4666dab4893 [diff] | |
| parent | f3a387d7317ec8e0d739a709cba4a8c53d0abd2d [diff] |
Merge "resolve merge conflicts of 46378eb881ab96b90a7a2922775ecceb184456c7 to sc-v2-dev" into sc-v2-dev am: f3a387d731 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15351394 Change-Id: If1169f6a7d1db4bed676d9d4a4039f830ab00077