diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-13 14:53:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-13 14:53:54 -0700 |
| commit | 8d6b8ef68c4177a0b6f378143994a8eec70f82b4 (patch) | |
| tree | 5ad214eecce158394dd89951ccd0ddcf72ed777b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 801a6dfa8abf67649b752a6a83c74b5d44dc17d1 (diff) | |
| parent | 1e477a0fb41ad45d7704ffa4ebe87281d02410be (diff) | |
am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.
* commit '9163a4a686fc25fefc77d5b41c24a4538486a48e':
Merge 36a3a392 from mr1.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions