diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 11:20:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 11:20:35 -0700 |
| commit | 7a429e2b4ee4a089f613f6aff1e79a8a752b42b7 (patch) | |
| tree | 28de80333907879eb5e3aa31e9eafff1e8f08fbb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ba54c76edeaf7558348d8955e5a63758bcf99f8a (diff) | |
| parent | 5aac807823b4b06549342ccae0ef15418ebe6d95 (diff) | |
am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread
Merge commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp
* commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8':
SipAudioCall: remove SipManager dependency.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions