OSDN Git Service

am 9c79938d: Document that some parameters will not be null and fix getSupportedPictu...
authorWu-cheng Li <wuchengli@google.com>
Tue, 8 Dec 2009 03:38:01 +0000 (19:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 03:38:01 +0000 (19:38 -0800)
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2

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


Trivial merge