diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-19 15:18:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 15:18:34 -0700 |
| commit | c22a9b7d8eb2e4b2162b0705376303ce9317ae64 (patch) | |
| tree | 849c2bad6cc17de4aabbf3d7c77473978f489cc3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 82fff40ab0522ab6e19d9e7a43764755d396d385 (diff) | |
| parent | 8c02312a82908ddbd0425d610ad3cbdb5930e47c (diff) | |
am 18ef3725: DO NOT MERGE. Fix the build.
Merge commit '18ef37258d897928c68b89535a93b99d8a817d3c' into gingerbread-plus-aosp
* commit '18ef37258d897928c68b89535a93b99d8a817d3c':
DO NOT MERGE. Fix the build.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions