diff options
| author | Vasu Nori <vnori@google.com> | 2010-04-27 16:53:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-27 16:53:16 -0700 |
| commit | 2267e70cb374f0feff81db6ffdc67d6089da2f9f (patch) | |
| tree | 0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0e9659ab935bce1e32f8e1ad7fa5dd995aaa6295 (diff) | |
| parent | dff737bf08e7d033a09390b0a5fd58c4d5abedda (diff) | |
am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken
* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
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