am 4e235622: am b1bb7180: am 3bf5c4cd: Merge "fix markup error bug:2871538" into froyo

Merge commit '4e235622bc37e54208b88a18251f3682495af41f'

* commit '4e235622bc37e54208b88a18251f3682495af41f':
  fix markup error