diff options
| author | Peng Xu <pengxu@google.com> | 2017-09-22 17:47:32 -0700 |
|---|---|---|
| committer | Peng Xu <pengxu@google.com> | 2017-09-22 17:47:32 -0700 |
| commit | 3cd9b00a9a7c0958f833a6aac768511558d4d0c4 (patch) | |
| tree | 604b679cb20a8e70b789fbd39832f1a6a9c2eda9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8fe617eaad645a9ba9b48d46c90cd8eee46010c1 (diff) | |
| parent | 4f33ab9eff361a2d4fd5f07b18ecda4c79f33c88 (diff) | |
resolve merge conflicts of 4f33ab9ef to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I329c2bb8067ea163ce5d4be967c271cfa04b4c68
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions