diff options
| author | Vasu Nori <vnori@google.com> | 2010-04-27 16:49:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-27 16:49:29 -0700 |
| commit | dff737bf08e7d033a09390b0a5fd58c4d5abedda (patch) | |
| tree | 532df9facad6571445d85a65fb59ba0580ea5050 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f3a7bca481bf83e886d3d0365a20c58ddcd024fc (diff) | |
| parent | 321e49b260ded8d1283d01ab64034231ee761f99 (diff) | |
am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp
* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
remove myname accidentally included in one of the files
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions