diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-23 16:40:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 16:40:09 -0700 |
| commit | 816ff9b828c3804d08b78672b563627ade705b76 (patch) | |
| tree | d8edf6124d84ea83998f22a8e766e58fdfde6af4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1a4c979cd7b9b2a81cc4a8b36ec0e421bea238bc (diff) | |
| parent | d03ee8731e339cf8aded7073d54c876c62f77d47 (diff) | |
am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53' into gingerbread-plus-aosp
* commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53':
Handle OPTIONS requests from SIP servers.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions