tree 5d74f21d224575044c957e2655ac393cbb94e936
parent b1f6bd581ba5dc6003d5d49eb2318bd4538787e9
parent 53998af338e60d93c2fc5e06e92a000ede27c26d
author Xin Li <delphij@google.com> 1633657187 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657187 +0000

[automerger skipped] Merge Android 12 am: b8924450d9 -s ours am: 53998af338 -s ours

am skip reason: Merged-In I26ea52b77ac7824649b4a6bd3ddd253d0ef80f73 with SHA-1 9edace21f5 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/glslang/+/1847159

Change-Id: I61d79730607f3a7c0d717989552792fc22a73f85