diff options
| author | Andreas Huber <andih@google.com> | 2009-12-17 10:27:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:27:48 -0800 |
| commit | a888f83db6d6612999f7287236ec3506395d9d80 (patch) | |
| tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f631e832e1ed383937ea2fa1abfb5cdfc76a72c1 (diff) | |
| parent | 81969be457f987eea7092cdad05d09026aee9d19 (diff) | |
am b5c6be6d: am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb'
* commit 'b5c6be6db25d9e9405ea4cf20bbedd46a62dc0bb':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions