Merge "fix markup error bug:2871538" into froyo