Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp * commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b': docs: fix markup error in xml sample