diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-23 14:17:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 14:17:54 -0700 |
| commit | ac86d33e1de2d13fa12abf7bdb77b94e9be564be (patch) | |
| tree | d8edf6124d84ea83998f22a8e766e58fdfde6af4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2d9b3556bbc4f2f3bab12e406fb8d71652c67939 (diff) | |
| parent | 63dfdc39cad068187479c3dd848191f8946612f3 (diff) | |
am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp
* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
Fix a deadlock I ran into.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions