diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-21 10:43:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 10:43:24 -0700 |
| commit | aa89c11bab4afd33d0ebb9f4d927929d0f8b39dc (patch) | |
| tree | ec4e1fe7ceb1ade1ee4dde94bac31bca50cb04cb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bc6a5e7693a6a771a5dddaa0f509ce08f3e265b2 (diff) | |
| parent | 55d51aed829a03c8cbdbcacd0d2537b912b654c3 (diff) | |
am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'
* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
Revert the ANSWERING state.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions