| commit | e3d7a5ca0d5b6755c9e00497521a39362c4ba211 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Jun 15 02:46:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 02:46:05 2021 +0000 |
| tree | 472ef2f7eb1aa48549c29f5bba6f367fbbe279e5 | |
| parent | 58f88c29c8e39492a7d5c8a2e971b44400d05e3b [diff] | |
| parent | 620c7d1854b1018d8979ade44c6ab88cc82b2b2e [diff] |
resolve merge conflicts of bea8267854585b5cf51ec15d85cac0e2ca6e4f20 to sc-v2-dev am: 620c7d1854 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14964089 Change-Id: Id59c40b240acf1aaeb71b345bb1f9ce2a34932e5