diff options
| author | Kenny Root <kroot@google.com> | 2010-10-10 11:15:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 11:15:44 -0700 |
| commit | 32f6a6c3c681c46166b5d68552873060a066d825 (patch) | |
| tree | 81b14fb82ce8e951b01534e65e8b4bd4bdf6cb94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ca2c482ffd0fe46cd1d5b7d856ddcfea4a5b0f79 (diff) | |
| parent | d5f3d15f2dff467699f639c41c1caa5ac47dccad (diff) | |
am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'
* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
Eliminate MCS_GIVE_UP state
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
