summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-17 02:06:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-17 02:06:19 -0700
commit55e797113c6a862a835b0512b49202124acbfbfa (patch)
tree14edce3ac206fe1263a48c8e8fc5a71510d5a351 /opengl/tests/gl_basic/gl_basic.cpp
parent28267913d27a3609e9fc6515f8fe2af8bb2e70dd (diff)
parent5ef59746b6dc01ec4bb1a07672cd972274fa6b96 (diff)
am 960d409c: am 1d158357: SipPhone: do not append SIP domain to PSTN number
Merge commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e' * commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e': SipPhone: do not append SIP domain to PSTN number
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions