diff options
| author | Yimin Li <ymli@google.com> | 2022-01-19 19:33:32 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-19 23:33:30 +0000 |
| commit | da561daac9ddff4c8d5379a42493f830f262dc37 (patch) | |
| tree | dfa63472f41c8256e229c78f9002bb46ffce98af /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2b1e74f35f9901253124876c6a5a9e65a69a3a39 (diff) | |
resolve Coastguard cherrypick merge conflict for change: 16673248
Change-Id: If2977f1096da8546950f2fcab4f745d18da9d63f
(cherry picked from commit 75ddbb9023ca4ebb5ed3d06135d8a5f6d37223a2)
Merged-In:If2977f1096da8546950f2fcab4f745d18da9d63f
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions