Merge commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc' into eclair-mr2-plus-aosp * commit '3170f9a7cf32d6935e6c468e907f9b5427ebadbc': Fixing broken javadoc.