tree 71181f84a33360ed77e4342ccd550aa6b78cffa0
parent 392c70d64f3df78f3960707173d3e81d00c3a388
parent ad321dfbee1fdeb372bec4093e8a90eff89410c2
author Lloyd Pique <lpique@google.com> 1692238622 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692238622 +0000

[automerger skipped] Prepare to update to 1.22.0 am: b67f5b97f6 am: 28e86b61c6 -s ours am: 6286dd188f -s ours am: ad321dfbee -s ours

am skip reason: Merged-In I91b450f1e1930b0214ba8a628be1be659e030b88 with SHA-1 a5f6b8333b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/2699956

Change-Id: If81e065894da09325984ac733f67e74f67c7186a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>