diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-26 15:07:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-26 15:07:27 -0700 |
| commit | 7e3f56abd8b05cdd59007da407aaa9115895ef5a (patch) | |
| tree | 6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 830227f9b8f504cf1968eae2deb392d453c34ada (diff) | |
| parent | 96ed8973b9f862415d9acef31fdf93fa137af51b (diff) | |
Merge "resolved conflicts for merge of f309c7a8 to master"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions