Merge "Remove an incorrect javadoc comment." into froyo