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)
commit13778accfee34d3cc6d7696e3fd7446de9698edc
treea5be31ab0030efa5ef514e1b9a89e073b27bdc35
parentb2909dbb87d3c2ee8eb14915415ffc787c8fb982
parent90073aadd5dfdbb0e7ca9b53ae086536f976793f
am 90073aad: am ebc77994: am 9c79938d: Document that some parameters will not be null and fix getSupportedPictureFormats.

Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'

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