diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-02-10 13:52:50 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-10 13:52:50 -0800 |
commit | db531d33d5fbac8e02d3b7b9568a64da393fe806 (patch) | |
tree | 7d7a028d06f50bc7c6b69ca625be3f375fc57640 | |
parent | ee4818b89e806fb1ef6d241cb8199716b2d0ca85 (diff) | |
parent | 4794d8f3a9318e063cd08501ddf66fa767af0c19 (diff) | |
download | android_external_nist-sip-db531d33d5fbac8e02d3b7b9568a64da393fe806.tar.gz android_external_nist-sip-db531d33d5fbac8e02d3b7b9568a64da393fe806.tar.bz2 android_external_nist-sip-db531d33d5fbac8e02d3b7b9568a64da393fe806.zip |
am 4794d8f3: reconcile with gingerbread
* commit '4794d8f3a9318e063cd08501ddf66fa767af0c19':
Max-Forwards is actually optional.
Only add maddr to the uri when it is different from the host.
0 files changed, 0 insertions, 0 deletions