diff options
| author | Grace Kloba <klobag@google.com> | 2010-03-01 16:27:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-01 16:27:44 -0800 |
| commit | 117aec7d0704360f99ca3be993c49a1c602e2c7a (patch) | |
| tree | 0e97277f75fa6e84dd804e9879ad33a23ec31d9e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dbb69c23cc7fb4c512c6975651a847d051dbf4dd (diff) | |
| parent | 84a75e90b645323b3578c976fd361077b4777e94 (diff) | |
am c0524d26: (-s ours) am 3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'
* commit 'c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions