Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread