diff options
| author | Christopher Tate <ctate@google.com> | 2009-12-11 13:20:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-11 13:20:15 -0800 |
| commit | fd47cf27bf946ca5cd18cd94f28d6b9f61b07b2f (patch) | |
| tree | aabc915b2771aa14c6c9a40f5ed6c5faa70a9cd9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 23e1b91e2c0223106e67e76fe4f7b7b7abd3ad5a (diff) | |
| parent | 7d900f26977782b90437fccf7b0e1e6337eeeaef (diff) | |
am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp
* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
Fix #2320798: Device hang then runtime restart
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions