diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-31 23:23:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-31 23:23:20 -0700 |
| commit | 2411741616734fae42d37302683752ca47d32126 (patch) | |
| tree | 53045ab4814fdaaa54ddbdbf0830bc7f0b51a223 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3a79a081de9016501054c0bb5d39ff77d7df7b7b (diff) | |
| parent | 22de8e037c5fcf012b3fb927a439f65b18ac8308 (diff) | |
am 6ff57ee3: am db3ea3d0: Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken
* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
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