diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-03 13:34:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-03 13:34:41 -0800 |
| commit | b102ed2bcfc91116cef48a3d4e8cfefbcb4ad962 (patch) | |
| tree | 0b8accc2d5b58e5121e60ec38a0a2b829f266455 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d5064c6252d440841e5bb408ed1b6bbad830d85b (diff) | |
| parent | 09a49faead475dc54b460f7a22da5ae7b4773092 (diff) | |
am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread
* commit '236afa6806c384a235782cde820a7f01de9e1b82':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
