diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-04 14:17:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-04 14:17:51 -0700 |
| commit | 0f9756171238cf26d657a033cde8e0b9356fb053 (patch) | |
| tree | c7f57a471ef7a293ba101955c412b9d2376d3908 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 041976e9b910e725a8a7bb98ae1c772016317185 (diff) | |
| parent | 4251f75f07327005c1652e84d09626ab3df984de (diff) | |
Merge "resolved conflicts for merge of 115b9dc3 to master"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions