Merge "fix xml sample error" into froyo