diff options
| author | Adam Powell <adamp@google.com> | 2010-10-06 16:22:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-06 16:22:03 -0700 |
| commit | 35641956fe30959c5898a12bded84f713148d544 (patch) | |
| tree | 50aa3ad08660fb96066b49ca042241fae09aeaec /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 00dd37af79317d9c4f2fa0ffe60132746cad861b (diff) | |
| parent | 3568e83037d7f7680b05434ec362b8672d2cffd4 (diff) | |
am 815b1eb8: (-s ours) am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846'
* commit '815b1eb870ea5b1d28de5be768d49e95c776c846':
Fix bug 3061769
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions