diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-15 19:06:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-15 19:06:20 -0800 |
| commit | cbcf8259697d2cb9025657a88e01cbb84be11d70 (patch) | |
| tree | 488017fd1bb32a3d20beb5c536a92ee6c268b7f7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4978c1a5b07782d622ca9e3eedd649a5927d226f (diff) | |
| parent | cdec187a27b2acc34cd4df26b836b83362527d6a (diff) | |
am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit 'cdec187a27b2acc34cd4df26b836b83362527d6a':
Whoops, need to acquire lock.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions