diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-21 09:44:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:44:23 -0700 |
| commit | cab7f41306da24a91f5acab3c92a4f9278983ccf (patch) | |
| tree | 793364f9b391f1b88ee318c2c97b4e8517d30bcf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c58fcad844d59f01dd6f5d9fc1c1803b075f1e10 (diff) | |
| parent | c22a9b7d8eb2e4b2162b0705376303ce9317ae64 (diff) | |
am 9a5c6e4f: (-s ours) am 18ef3725: DO NOT MERGE. Fix the build.
Merge commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f'
* commit '9a5c6e4f56e574e7591d8d3af1c2b64053df407f':
DO NOT MERGE. Fix the build.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions