summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-09-20 22:06:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-20 22:06:49 -0700
commit55d51aed829a03c8cbdbcacd0d2537b912b654c3 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parent6201fc3bb7d0d178e455e03c455912e9e434eacd (diff)
parent4e89ce3f98e7977c9ee5a16b19a19e44c8994393 (diff)
am 708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp * commit '708e42512a8b14202cd872d96d1f071ccb4cf915': Revert the ANSWERING state.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions