am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.
am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.

Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp

* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
  Document that some parameters will not be null and fix getSupportedPictureFormats.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base