diff options
| author | Andreas Huber <andih@google.com> | 2010-08-11 13:28:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 13:28:51 -0700 |
| commit | a97323a1fbab2e94f0c4a51c092a37bc1668dfd4 (patch) | |
| tree | ec2afb48cfbf0958ca5fbc29f6a00b72b9a9ad68 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9ff1dfae5478025e482f23f72e1ca972f7f778e8 (diff) | |
| parent | 58f81d841b3418c0629f3f5523c32b85e122fdd8 (diff) | |
am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp
* commit '90d1d104272954042d5440f248980e4348e97686':
This code in CameraSource really should hold the lock.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions