diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-04 15:53:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-04 15:53:44 -0800 |
| commit | 5e10f21c60f25d9125fbea556cfbdfedbb893d8c (patch) | |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 99fa5c84590c3d06ce2b2ea39e0c879d73b35213 (diff) | |
| parent | 973a0c5d678a47743bd9d8100a7e2fca17f5a1c1 (diff) | |
am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '826fbdf7b621861f24b71a16fbad53c2ccff1de7':
All runnable are stopped on detach. DO NOT MERGE.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions