diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-03-14 10:53:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 10:53:38 -0700 |
| commit | 928595e7f0514b35ff1ac3c04a64c7ab7cc43afa (patch) | |
| tree | aab456746a87080f3777cd2506e94fae18f43931 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 096b928fb8be7a2ea76d577466a86dbbd5061d09 (diff) | |
| parent | 1b9ff06914c320f06e3f4cc7284f371b2e4f48e9 (diff) | |
am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit '2e7415564ad1d77537f9f3d5151ed480fcfc6ef9':
DO NOT MERGE Backport of I1f55df8a from master.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions