OSDN Git Service

am ebc77994: am 9c79938d: Document that some parameters will not be null and fix...
authorWu-cheng Li <wuchengli@google.com>
Wed, 9 Dec 2009 23:42:20 +0000 (15:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Dec 2009 23:42:20 +0000 (15:42 -0800)
commit90073aadd5dfdbb0e7ca9b53ae086536f976793f
treedf33493c6c8abf2ecbc9d8fa993df270c8643f89
parentaeabdf32a2a38c1627102b90628b7261447d3a5c
parentebc7799444ccd4d34863f1a07e885ca423a49c43
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.