diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-21 23:15:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 23:15:20 -0700 |
| commit | 6a382f4bf431fea56d3d821c30d823aae14fa6ae (patch) | |
| tree | 16d550976076f0294750952e0cc42d55b9a64ea4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 525ebe17e31743e306d01fe6acda81bcbf1aa317 (diff) | |
| parent | 21d6871a3c1d237d4e4f11415b9b1b7b8dbe2f05 (diff) | |
am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Merge commit '1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp
* commit '1257d330dcfdb87214278c8fc9718ea9fc663df6':
Clean up pending sessions on incoming call in SipService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions