diff options
author | Ed Heyl <edheyl@google.com> | 2013-10-08 15:57:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-08 15:57:56 -0700 |
commit | 6589a42c0d7e6062f158b46829c71b092869cc44 (patch) | |
tree | 2fe824bb33d1f96387d18a366f051938a1bc3aae /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 790b6d092ce2702c9d561dfd2c873b5793e765d2 (diff) | |
parent | 98c197d826f95a82de41e16350f58a70a7ad23c6 (diff) |
am 98c197d8: merge in KQS81M
* commit '98c197d826f95a82de41e16350f58a70a7ad23c6':
GLConsumer: Add query for current frame number.
Disable GLES 2.x rendering
Initialize mIndent
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions