diff options
| author | Yimin Li <ymli@google.com> | 2021-12-16 05:38:38 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 21:13:12 +0000 |
| commit | 285732a9aee7988eec14b4cee6884785374c8066 (patch) | |
| tree | 54717898ff79bcdc53d84b54d0b4a5ab986450b2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ed52c8e7251714877f66ed2191d3017335cba99d (diff) | |
resolve Coastguard cherrypick merge conflict for change: 16485739
Change-Id: If398ac883f366463f674042cfce6e344a84d0c87
(cherry picked from commit d4b490a8d6e15f8573b879d896a9959df1c53b4b)
Merged-In:If398ac883f366463f674042cfce6e344a84d0c87
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions