tree d8edf6124d84ea83998f22a8e766e58fdfde6af4
parent 1a4c979cd7b9b2a81cc4a8b36ec0e421bea238bc
parent d03ee8731e339cf8aded7073d54c876c62f77d47
author Chung-yih Wang <cywang@google.com> 1285285209 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285285209 -0700

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.