summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chung-yih Wang <cywang@google.com> 2010-09-23 21:39:49 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-23 21:39:49 -0700
commit57363e918a7c896f9e7c5626dd26a1817129ecbf (patch)
tree17ec9a14f6d446967c811141e1b449f24124dd39
parent872736e3ca1bd8a615db26c9dacc13ce2acc10a1 (diff)
parent816ff9b828c3804d08b78672b563627ade705b76 (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.
0 files changed, 0 insertions, 0 deletions