tree 81c71244acb3b7c2f83a8889c17a9ef05fa42719
parent 0766b2d0f398dcad10e332b695bbc0cbe5011882
parent 9c79938d47a3caa06e5fb956955374f30c55992b
author Wu-cheng Li <wuchengli@google.com> 1260243481 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260243481 -0800

am 9c79938d: 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.