diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-05-31 16:02:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-31 16:02:54 -0700 |
| commit | 49c3905913bf540fd2d65b547aa49c0985c24749 (patch) | |
| tree | c97b8969e4ef613eb50132c6fb67db73972f0892 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fb6cda5443b77a6aa231565b1a7f05d1849132ef (diff) | |
| parent | 17c614e241d41e14f29c4c73ef2b2d85a3974307 (diff) | |
am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
Fix deadlock in dispatcher. (DO NOT MERGE)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions