commit | f8ce6b8a02bcd2c164488ff4d826d5a41aca6a13 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:50 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:50 2020 +0000 |
tree | b3ef840368405f2464835e406c841b4c394b517c | |
parent | 599402a83b45e34840dc99e3450cc8ccd8df0fda [diff] | |
parent | 61fff86c645d73f510fd72b1c9f609106e5c5d91 [diff] |
[automerger skipped] Merge Android R am: 847ddc185e -s ours am: 5dcee2010d -s ours am: 61fff86c64 -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: I85b8d288b0b4112c9d02ef62bfd6bcc5f90a1d18