| commit | 7d0eb7318e8e8123f5392760c25a21d25b29101b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:20 2020 +0000 |
| tree | b3ef840368405f2464835e406c841b4c394b517c | |
| parent | 730e40e7b00dcedebb19fca42f110ff506f690e9 [diff] | |
| parent | f8ce6b8a02bcd2c164488ff4d826d5a41aca6a13 [diff] |
[automerger skipped] Merge Android R am: 847ddc185e -s ours am: 5dcee2010d -s ours am: 61fff86c64 -s ours am: f8ce6b8a02 -s ours am skip reason: Change-Id If2692a1a48cdac011b02966f1355033b211e71ef with SHA-1 0295da1650 is in history Original change: https://android-review.googlesource.com/c/platform/external/deqp-deps/glslang/+/1421773 Change-Id: I4dc10fb53c490b2d9d7ca5b25ed28bafd5e10397