Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp * commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233': Add support for XING header
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp * commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233': Add support for XING header