diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 16:31:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 16:31:17 -0800 |
| commit | d2041b810e94b83549d60ffb6d125fddf32f8eb4 (patch) | |
| tree | 12628ec22bf1f54d78253b347e3e94b3ad8f0d20 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0c66eb20fc5f148288b08218bcc3715baa54d974 (diff) | |
| parent | 1371ecced58ebea8b03468a8ea0df1de0984bf9f (diff) | |
Merge "resolved conflicts for merge of 998a929a to master"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions