diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-06-21 15:28:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-21 15:28:12 -0700 |
| commit | d871b3ac28044342b0bd7d8a453c2110254cf7b2 (patch) | |
| tree | c16c788b2e7a62de5b85b9fecf5b9b2674e76c8f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dc1733beef81e0f98d8087a5f016121829fedf1a (diff) | |
| parent | 0f0f4960f84202a76657e5b2b26dfeed28184042 (diff) | |
am 49b73385: am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"
* commit '49b73385146cb566e242c63abc3c3781750bec43':
Tweaks for forward-compatibility
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions