diff options
author | John Wang <johnwang@google.com> | 2011-11-23 16:50:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-23 16:50:04 -0800 |
commit | 9b34f131f6da954b42b7fdc4d906c42a1bf144a1 (patch) | |
tree | 9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | f4637eae614cfaab0377cd6dc84595d6510b3420 (diff) | |
parent | 0f20328ac05c54e71b26f4d9cb49fb9056a24048 (diff) |
am e95f4986: Merge "Fix a build break." into ics-mr1
* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
Fix a build break.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions