OSDN Git Service

am 90073aad: am ebc77994: am 9c79938d: Document that some parameters will not be...
authorWu-cheng Li <wuchengli@google.com>
Thu, 10 Dec 2009 15:01:12 +0000 (07:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Dec 2009 15:01:12 +0000 (07:01 -0800)
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'

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


Trivial merge