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:47:45 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-13 13:47:45 -0800
commit8139a24dbe09a83ef5a9c8f70573ca8565f1f5a1 (patch)
tree2fe3e4c4f68b1797ac40886986f00e9924358d23 /opengl/tests/gl_basic/gl_basic.cpp
parent198b2458fd07b7c1bc4f9618f1b69b6fc2bc6f9e (diff)
parent1f71efd353145ec053602ca3c48f3fd349a8c263 (diff)
am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1
* commit '5f5ea91f60b4b7d2fcf3da3603cd745a53cba48f': extending timeout to stabilize tests
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions