tree 5d74f21d224575044c957e2655ac393cbb94e936
parent e8df690eb7de57c0d4d26cdf3d35ea98e4344591
parent 7b17b3003f4226a6013178129b0d7289b353bca1
author Xin Li <delphij@google.com> 1633679823 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679823 +0000

[automerger skipped] Merge Android 12 am: b8924450d9 -s ours am: 53998af338 -s ours am: 7b17b3003f -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: Ia94905d8e64021062348327addfb780314ec804b