diff options
| author | Joe Onorato <joeo@android.com> | 2010-08-31 13:29:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 13:29:30 -0700 |
| commit | 93df230827209e5e9f9f57c8beda37236cdcb214 (patch) | |
| tree | 380bbbb1666ddbc975f210f8d47912363440eed0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | de0e50602654fb5039d1e946f315ceac462cbedb (diff) | |
| parent | 38d4fb7b15305798d715323aec625aa7de29953e (diff) | |
am b1824cfc: am 54901c9e: fix the build. will revisit this change in a minute
Merge commit 'b1824cfca7dde367197662953b7478a9dbceab27'
* commit 'b1824cfca7dde367197662953b7478a9dbceab27':
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
