diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-25 00:01:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 00:01:25 -0700 |
| commit | cb7082e0e4fd33ca9868974c6e35d1620f916087 (patch) | |
| tree | 3d7a6ea3e640e88684325b18b52731badb53d295 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fae2a9e895f527bfe3197645eb587b9d5b7feb2f (diff) | |
| parent | 763e7688a181876c277f100a2e83d05b65a4f542 (diff) | |
am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '73497e9200e9db653cae56c631db55c133915f10'
* commit '73497e9200e9db653cae56c631db55c133915f10':
SipProfile: add isOutgoingCallAllowed() and new builder constructor
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions