diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 16:01:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 16:01:34 -0700 |
| commit | db755988991e476a707875740c149890d1bb58d1 (patch) | |
| tree | 148065c8ad7acd5ff445c1e7af5f5188f8c06a33 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9c1d61add4eb89abd09773da5e97d8d73208f8c4 (diff) | |
| parent | 13387dbf95917eef99918a87e01a6e727bc20df3 (diff) | |
am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'
* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
Must hold lock here...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions