diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-05-25 19:00:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 19:00:42 -0700 |
| commit | 17c614e241d41e14f29c4c73ef2b2d85a3974307 (patch) | |
| tree | 2ee963463c3506b8788200904160b078e5e5a51d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 48fcbcf299bbe0a2d9835652403f333bda1bf4a4 (diff) | |
| parent | 657467eccdf963d2052eb163d520a8ff28bc088b (diff) | |
am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
Fix deadlock in dispatcher. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions