summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2010-04-10 11:48:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:48:06 -0700
commitf059f5c9f71d72129b68517bbb547e53982f26ab (patch)
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp
parentdac67195b9d9bb1265f3e5736d2b5ff29923e4fd (diff)
parent913ae44953b16e1b00ecb8f56012e63ea65429ae (diff)
am 6e40664f: am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Merge commit '6e40664fc75e25ebeafda883fc2bba27279bebdd' into kraken * commit '6e40664fc75e25ebeafda883fc2bba27279bebdd': Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions