am ebc77994: am 9c79938d: Document that some parameters will not be null and...
am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit 'ebc77994' into eclair-mr2-plus-aosp
* commit 'ebc77994':
Document that some parameters will not be null and fix getSupportedPictureFormats.