tree 4cd22387ed6d1956bd595c703155272179238c9f
parent 750a64aca07faf032f1e3ea40cee840d34be0d2c
parent 791c626addcb30c6fbe3522aa7e1afe86ce4d233
author Gloria Wang <gwang@google.com> 1261161258 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261161258 -0800

am 791c626a: Merge change Ibac388a3 into eclair-mr2

Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
  Add support for XING header