| commit | b21ee74847d2605cb82db3bcd2bc6ad1b8904c2e | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Jun 15 02:54:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 15 02:54:49 2021 +0000 |
| tree | a842c5318236f5a7bc1cb65eda35c941ead26e9f | |
| parent | 3efa9d0bfc4a340906cb3527fdd49cb6af225f7f [diff] | |
| parent | e3d7a5ca0d5b6755c9e00497521a39362c4ba211 [diff] |
[automerger skipped] resolve merge conflicts of bea8267854585b5cf51ec15d85cac0e2ca6e4f20 to sc-v2-dev am: 620c7d1854 am: e3d7a5ca0d -s ours am skip reason: Merged-In Ia904b8b96301042c900e0589f33fc625c1c1148b with SHA-1 0750f03c96 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14964089 Change-Id: Iedd44dd301ffe3e43fb88518b0440cf1b4555b55