summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Huang <jsh@google.com>2010-10-21 15:29:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 15:29:48 -0700
commit437a550f532811715daba787dfa09b984da6966f (patch)
treef3551db9e5b953b71b7dd63e361d0aeff246001a /opengl/tests/gl_basic/gl_basic.cpp
parent64408a387874df98267777fd510ad0a03ea20d0a (diff)
parent4a60d1cddfb80ed5b6e60f9e27c5308e33e01657 (diff)
am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c' * commit '33051ad1785a84ad5d814d6acf337b54d5fab36c': Fix connect duration for un-established SIP calls.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions