Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810' * commit '992a9e507fb1f8da7358b4d805c034d934eb1810': DropBox.Entry javadoc syntax fix
Merge commit '992a9e507fb1f8da7358b4d805c034d934eb1810' * commit '992a9e507fb1f8da7358b4d805c034d934eb1810': DropBox.Entry javadoc syntax fix