| commit | 01a411326e8d3370643ca181966ae3214ea700fd | [log] [tgz] |
|---|---|---|
| author | Chung-yih Wang <cywang@google.com> | Thu Sep 23 21:39:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 23 21:39:49 2010 -0700 |
| tree | c4df49b8c36077bcf93763f67015c9b03d0f6113 | |
| parent | 0eb74130ac1fa7e5dd1c943c5a0a119053f23408 [diff] | |
| parent | 1e2df14a85f098d63b618531db733a21429d4037 [diff] |
am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread Merge commit '1e2df14a85f098d63b618531db733a21429d4037' * commit '1e2df14a85f098d63b618531db733a21429d4037': Handle OPTIONS requests from SIP servers.