tree 3fb1d62247f682732d95cd15e69755e3a72dd5dc
parent be37c3ce836527514bdf2c6fb83e59a9f2f661d7
parent 9801564dbff3c47e747add686feec622575a9869
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