diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-07 13:48:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 13:48:26 -0800 |
| commit | 97bf20c581b228cb2a44c7c2aa4f7bec9fa7bd5b (patch) | |
| tree | efa5facc8ad5b4fbe0e450f0b8bbb09f38c93530 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 03cc6db14181219acf8b2f86279f5db2fff39e62 (diff) | |
| parent | 978dfdaa1e5c8654a2a02eae8d7d006e7ced8c64 (diff) | |
am 978dfdaa: (-s ours) am 826fbdf7: (-s ours) am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
* commit '978dfdaa1e5c8654a2a02eae8d7d006e7ced8c64':
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