diff options
author | Andreas Huber <andih@google.com> | 2009-12-17 10:23:46 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:23:46 -0800 |
commit | 81969be457f987eea7092cdad05d09026aee9d19 (patch) | |
tree | 935174efb7ab3e6f273573cf96df95f2f7ebb9dc /opengl/tests/gl_basic/gl_basic.cpp | |
parent | bb7fb4603f106e6831f4590a610c506e9baee68c (diff) | |
parent | 5ada1a677dcf4b7a98cf335f08950d6912343332 (diff) |
am 082e5171: Merge change I895fb7d7 into eclair-mr2
Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp
* commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d':
Squashed commit of the following:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions