diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-12-02 05:25:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-02 05:25:12 -0800 |
| commit | ad7ab8be4774a4fbb01a50deed52e819549327a7 (patch) | |
| tree | 50a09314e15cdfc935884d996079ea3c29566c37 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 54f32f562b455ddea84ad9b95946a98e6dfb6686 (diff) | |
| parent | db08d5cd441424e4f9621aae7c2414934f781400 (diff) | |
am db08d5cd: (-s ours) DO NOT MERGE.
Merge commit 'db08d5cd441424e4f9621aae7c2414934f781400' into eclair-mr2
* commit 'db08d5cd441424e4f9621aae7c2414934f781400':
DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions