tree c4df49b8c36077bcf93763f67015c9b03d0f6113
parent 0eb74130ac1fa7e5dd1c943c5a0a119053f23408
parent 1e2df14a85f098d63b618531db733a21429d4037
author Chung-yih Wang <cywang@google.com> 1285303189 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285303189 -0700

am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread

Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.