summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorTsu Chiang Chuang <tsu@google.com>2012-02-13 13:42:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-13 13:42:45 -0800
commitc1720bacf3413d30a6a1ddb4e5e01d42b8f92117 (patch)
tree06d7ef351a246ff1c66c2a687bc62609fa110759 /opengl/tests/gl_basic/gl_basic.cpp
parenta4ebe8d29ac64110e84ec57a5e9527db6564fcc9 (diff)
parent0137d87be04e182b4c5ffe5f22013c09111f63a7 (diff)
am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb': extending timeout to stabilize tests
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions