am 288509a9: am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair

Merge commit '288509a959d437d75b1cd706431e21ccf911531f' into eclair-mr2-plus-aosp

* commit '288509a959d437d75b1cd706431e21ccf911531f':
  Move updated 6.xml from eclair-sholes-release into eclair