tree 7d7a028d06f50bc7c6b69ca625be3f375fc57640
parent ee4818b89e806fb1ef6d241cb8199716b2d0ca85
parent 4794d8f3a9318e063cd08501ddf66fa767af0c19
author Jean-Baptiste Queru <jbq@google.com> 1297374770 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297374770 -0800

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.