diff options
| author | Chia-I Wu <olv@google.com> | 2017-11-20 10:43:41 -0800 |
|---|---|---|
| committer | Chia-I Wu <olv@google.com> | 2017-11-20 11:18:52 -0800 |
| commit | 9225761c8d031c7e8a10062fb8e8d50db3b726ff (patch) | |
| tree | 2fb40163ed70e1bf724f525cbd6201680f167f33 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4256a72959b63d3648760ae3956ac3b6922fe807 (diff) | |
| parent | 8a21353442e82017d6a794e1905177be9d5119a4 (diff) | |
resolve merge conflicts of 8a2135344 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I68bbf392a6681c6512fc0be68a7d17df122f7308
Change-Id: I7fa7ac49d397b6288f34faa97644147f47cfb8e7
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions