Merge "DropBox.Entry javadoc syntax fix" into gingerbread