diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-24 05:00:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 05:00:11 -0700 |
| commit | 7055d2fc7ec223efeb328a9835bb0ffb04470343 (patch) | |
| tree | 85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7ebabee05ef882d8117b3c0b4f6a3aa40da2bd46 (diff) | |
| parent | cb82742e582df63a593ab6c21b9e4d4857c502c3 (diff) | |
am 3294d44b: Add confcall management to SIP calls
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp
* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
Add confcall management to SIP calls
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions