diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-12-09 15:56:59 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 15:56:59 -0800 |
commit | 2a01f94344cb40305f1162a327b8c8a67310fde4 (patch) | |
tree | 1d9e82046c6466883704e8e00b4b11826b6ece0f /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 24c6066fdadd6eeef132c87fb6f3aa6609f0a539 (diff) | |
parent | 80240139e39795c1176cf0ab7ab32986aa681422 (diff) |
am 484fe4d6: Merge change I06fb2c1c into eclair-mr2
Merge commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f' into eclair-mr2-plus-aosp
* commit '484fe4d6f45d5dc42c378baaad3fdad7d6ae612f':
Hopefully fix Windows build
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions