summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-21 09:50:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 09:50:50 -0700
commit653b5e25b508f9c911bb61ca1a74d649b6800642 (patch)
tree54b76e53206c2793446cf8721ef56ae37919ca70 /opengl/tests/gl_basic/gl_basic.cpp
parent2e6dd6150e777333591dc1468811bd83a34035d7 (diff)
parentd04bc8b1e14fefc8c9bff528a81bbed38811da7e (diff)
am 35d9e770: am 0a6e717f: Handle dialing a SIP call to self.
Merge commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2' * commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2': Handle dialing a SIP call to self.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions