diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-24 23:59:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 23:59:28 -0700 |
| commit | 763e7688a181876c277f100a2e83d05b65a4f542 (patch) | |
| tree | 0314b93c0f69ae613944b5e5ca4df9908f1217ad /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 62f83874a49f4a47d02e93b1439934b1fa66f7ef (diff) | |
| parent | 7a84ed62a88a9b1d66fd19f9ec9bb8ec536e5177 (diff) | |
am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread
Merge commit '37f709aeb0424948a8f69577c6fad39dc95d7733' into gingerbread-plus-aosp
* commit '37f709aeb0424948a8f69577c6fad39dc95d7733':
SipProfile: add isOutgoingCallAllowed() and new builder constructor
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions