diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-31 23:18:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 23:18:32 -0700 |
| commit | 22de8e037c5fcf012b3fb927a439f65b18ac8308 (patch) | |
| tree | c618308f3d2ab6e6abd0e25c71cec46daede8532 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 836e97da7564cbf03fbed9ee810f8aaf340f9738 (diff) | |
| parent | ca85c03c8fadfada2d12e2287d3251905c729e27 (diff) | |
am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions