Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2 * commit '9c79938d47a3caa06e5fb956955374f30c55992b': Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2 * commit '9c79938d47a3caa06e5fb956955374f30c55992b': Document that some parameters will not be null and fix getSupportedPictureFormats.