| commit | 85438262225ddb153af2bc8422e99d5be4fe029a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Oct 13 04:50:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 13 04:50:34 2020 +0000 |
| tree | 9cf9f2564e28ec9327dbb1b0352acdcb2782d003 | |
| parent | 31163a9034c56d6e878ad231b4831496f2a7e497 [diff] | |
| parent | 5924d3a3511740f5312330ae742b22f13c50ed0b [diff] |
[automerger skipped] Merge ab/6749736 in stage. am: 21d8cf0eee -s ours am: e1b95b4a82 -s ours am: 5924d3a351 -s ours am skip reason: Change-Id I293298e3e46a082b2aceeee2b3711db0a843b156 with SHA-1 e56d9160e9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland-protocols/+/12804434 Change-Id: I213582c866074cc0aeffb100a81f17652e66f19b