diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-08-10 20:50:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 20:50:40 -0700 |
| commit | b620339adac898c1e276a2b08f0b7bb319f68c06 (patch) | |
| tree | 1e3818e4a7e8c121b443ebecd3a7f11586fa50e7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9c47e70d760eaa2d24fa5b3dcaf0b87fb0105ccb (diff) | |
| parent | 5736292a1af45442f5087565b5262ffaff84c231 (diff) | |
am 091c5238: Merge "SipAudioCall: perform local ops before network op in endCall()" into gingerbread
Merge commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077' into gingerbread-plus-aosp
* commit '091c5238a00ca51dc69b8b09459e6ac88e1eb077':
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