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

Merge commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13' into gingerbread-plus-aosp

* commit 'b1bb7180ec3446208ea717d96f6a507ea9955a13':
  fix markup error