diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-23 14:20:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 14:20:48 -0700 |
| commit | ef0f5e1e61dac060b72962e665036dc0d352bc5d (patch) | |
| tree | de37fba2bf73f69a025d3c4f3ee308e070ed23c3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 82f019dca7578dd4867e3b7d9282991146e8b7f0 (diff) | |
| parent | ac86d33e1de2d13fa12abf7bdb77b94e9be564be (diff) | |
am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773'
* commit '2983e038d189a257f1e5abb9c120bd1feb253773':
Fix a deadlock I ran into.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions