diff options
| author | James Dong <jdong@google.com> | 2010-08-12 17:05:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 17:05:28 -0700 |
| commit | f6f994f4a703590778860bc748a805ead6057216 (patch) | |
| tree | efcecb33ab8b7e99aa5f484191393f9f1578a0f8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 82bb4e190c900636c1875106fa030985e0a5909c (diff) | |
| parent | 42d9c1bdb839508bfa04b374221ee1108edcdfb3 (diff) | |
am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:
Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'
* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
Mainly fix two mistakes that I made:
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions