summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-11-11 11:51:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 11:51:09 -0800
commitff0bd468d8cf0f51c07927c758563a3f696c32a4 (patch)
tree2ae0aaeb3967b5271bfad42def318fbf04d098b2 /opengl/tests/gl_basic/gl_basic.cpp
parente5fe1b302d68a1ca2ee3f16cdcbce276fe3d9776 (diff)
parent9c981cd3d53238f10842368c1cd82d625b701a47 (diff)
am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '9c981cd3d53238f10842368c1cd82d625b701a47': Disconnect on socket error on the RTSP control connection.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions