tree 25fbf5e10242b39fc3b87c7b61ffaa2b16007e5c
parent 3db090380ce1c6ad6199ead9cd711a7bc9b7367f
parent 6ee7522c84ef383b2a1a2f9805138f67f6451d1c
author Lucas Dupin <dupin@google.com> 1629864294 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629864294 +0000

[automerger skipped] Synchronize surface transaction am: 0a2076e8d3 am: e3cf162169 -s ours am: 6ee7522c84 -s ours

am skip reason: Merged-In I1636a1ded4f9dd84c54ba12239e3549b92ed7567 with SHA-1 0c70dbdc5e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15669618

Change-Id: Ia879c0987fb14288f782b2c7874a71bc5eba5350