diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-05 18:37:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-05 18:37:14 -0700 |
| commit | 19f2160e32327989fd6292fc45e541c18ec139b9 (patch) | |
| tree | 19aabb3f1a49b5b96b18c4b1ffd531bfbf2ceffa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8e644c37927151fe7ee9d68240afa72bdfbc1c6f (diff) | |
| parent | 824bf846ca6aaaea0bda74c9125cc980dedae92d (diff) | |
am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp
* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
CallManager/SipPhone: fix reject a ringing call
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions