diff options
| author | John Huang <jsh@google.com> | 2010-10-18 13:44:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 13:44:57 -0700 |
| commit | 99fddbcf44e191de19de1e4e20467c5070226ebc (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73aa416a593bba4b971ef7f1ebf76605b6a4eb01 (diff) | |
| parent | 2d512f5736fe96a14474cc2d86aa208563fccd49 (diff) | |
am 45bd8303: Merge "Uncomment SIP/VOIP feature check in SipManager." into gingerbread
Merge commit '45bd8303fe20f20843f5a76ddf42a5ace54add58' into gingerbread-plus-aosp
* commit '45bd8303fe20f20843f5a76ddf42a5ace54add58':
Uncomment SIP/VOIP feature check in SipManager.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions