diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-10 21:54:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 21:54:07 -0700 |
| commit | 880d71a0034fa17aa0f4e8305b4b91cef810d548 (patch) | |
| tree | 350f06ee295c61fdb5b3f03049e08141652295bd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 11d4c629b3c39761b8b9f38722011af5221867db (diff) | |
| parent | b620339adac898c1e276a2b08f0b7bb319f68c06 (diff) | |
am 9a025349: am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '9a025349dc5a4e699fbe99a714f523e9903fa534'
* commit '9a025349dc5a4e699fbe99a714f523e9903fa534':
SipAudioCall: perform local ops before network op in endCall()
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions