diff options
author | Xin Li <delphij@google.com> | 2020-09-11 02:02:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:02:38 +0000 |
commit | efed65cd6010e57ab20a26d9aa86e305e0db21a0 (patch) | |
tree | df88a2dcf78266850400e1e5bd34cd261967246b | |
parent | 941a26d0b87667fd6227154d2d1d96e7bff7e7a0 (diff) | |
parent | 5db5d7bf021d7e6bb737140ff8e09d4604b2d437 (diff) | |
download | wayland-efed65cd6010e57ab20a26d9aa86e305e0db21a0.tar.gz |
[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours am: 5db5d7bf02 -s ours
am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393
Change-Id: I70b82debddff9a0448734d346e8fbad4e4e822aa
0 files changed, 0 insertions, 0 deletions