diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 15:59:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 15:59:30 -0700 |
| commit | 13387dbf95917eef99918a87e01a6e727bc20df3 (patch) | |
| tree | ba7baa1cbc2a4ab93b7523a90df9c8b132aab577 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 829c16e388de935aaa8efc922058d604ee7471e8 (diff) | |
| parent | 7cff0854f44da547e08a59715b547f6e17ee5d47 (diff) | |
am 126ca6f9: Merge "Must hold lock here..." into gingerbread
Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp
* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
Must hold lock here...
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions