tree 7bd3604cedeb7e9a5f07e81595e066025eb8e6d3
parent 3567bc34b20df7cd68d54f9500f485007b7a2759
parent 6a3453e2cc730e7a36a152ef811dc5aa4a05f394
author Xin Li <delphij@google.com> 1591631811 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631811 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 6a3453e2cc -s ours

am skip reason: Change-Id I03dd193ab81ad3c6892619e079dbedc392755235 with SHA-1 3567bc34b2 is in history

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

Change-Id: Iee08b5ffd56986aa1d1b3399358a40b7127facb9