diff options
| author | Qiwen Zhao <zhao@google.com> | 2015-07-10 01:44:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 01:44:49 +0000 |
| commit | ff5c983b2d7caf7d7370b3383ef16f3a51fa2cad (patch) | |
| tree | 095103a470538fe5411a943e55e6f897559708ac /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f34875c185ca5930e18cdcfde48c059dd534b539 (diff) | |
| parent | 982719b179aecc33aa6c258318fcbf6e4faa81d7 (diff) | |
am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history.
* commit '982719b179aecc33aa6c258318fcbf6e4faa81d7':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions