diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 13:29:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 13:29:10 -0700 |
| commit | de0e50602654fb5039d1e946f315ceac462cbedb (patch) | |
| tree | 380bbbb1666ddbc975f210f8d47912363440eed0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3c3e335d9fb6f87630e176cb187d8b359d815354 (diff) | |
| parent | cb2e65091835b26a9d5efce3ef84af3a708f3727 (diff) | |
am 5238c5f9: fix the build. will revisit this change in a minute
Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'
* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
fix the build. will revisit this change in a minute
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions