diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-18 08:04:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 08:04:35 -0700 |
| commit | bca5f6bad563da6ac19ae94b20ee2733691be0c5 (patch) | |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a20a97c95cad7b795d82d3e7892955f68a5b9803 (diff) | |
| parent | e6b39358d7e514198c8643b451a2dd7657cd9a00 (diff) | |
am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread
Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'
* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
fix build DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions