diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-08 10:25:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 10:25:50 -0700 |
| commit | f98a68841920f9f1786bedfd5a801eb0ad2c0cf7 (patch) | |
| tree | 8d8c8b31eb975d7399055448629ec0c0517c7190 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ceb931dcf2715c55ba3bd1b5d80254f654c217b7 (diff) | |
| parent | 19f2160e32327989fd6292fc45e541c18ec139b9 (diff) | |
am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'
* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
CallManager/SipPhone: fix reject a ringing call
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions