am dd08aca6: am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo

Merge commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581'

* commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581':
  fix xml sample error