summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-31 14:48:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 14:48:33 -0700
commit8c0c8f95760b705a080c88edfffd55a1bad0c1ef (patch)
tree380bbbb1666ddbc975f210f8d47912363440eed0 /opengl/tests/gl_basic/gl_basic.cpp
parent290d1dfa3d9732912d33a19ecd96a9a70bedbf71 (diff)
parent11441a355f9658324507ce0d2c3fc2abe9ded5b7 (diff)
am e1a3cddd: am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread
Merge commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf' * commit 'e1a3cddd94749a42457a8f32cf21f663f07e4edf': Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions