diff options
| author | Marco Nelissen <marcone@google.com> | 2010-10-07 17:52:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 17:52:15 -0700 |
| commit | 2ae3dd2ce1fb1afa60cf99b9b667445bf92010b4 (patch) | |
| tree | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | df8ae2a6335b24ed6f67405f4a1b4a71b4588572 (diff) | |
| parent | 8950fabfbc74652f511125ccd76dd5fb405871f4 (diff) | |
am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp
* commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513':
Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions