am 1e52988a: Merge change 23940 into eclair

Merge commit '1e52988adc9e7b6136374d01e7537d756ac89f82' into eclair-plus-aosp

* commit '1e52988adc9e7b6136374d01e7537d756ac89f82':
  Add more documents on the ACTION_SEND_MULTIPLE intent.

core/java/android/content/Intent.java

@@ -923,6 +923,16 @@ public class Intent implements Parcelable {
      * get*ArrayListExtra can have either a {@link #EXTRA_TEXT} or {@link
      * #EXTRA_STREAM} field, containing the data to be sent.
      * <p>
+     * Multiple types are supported, and receivers should handle mixed types
+     * whenever possible. The right way for the receiver to check them is to
+     * use the content resolver on each URI. The intent sender should try to
+     * put the most concrete mime type in the intent type, but it can fall
+     * back to {@literal <type>/*} or {@literal *}/* as needed.
+     * <p>
+     * e.g. if you are sending image/jpg and image/jpg, the intent's type can
+     * be image/jpg, but if you are sending image/jpg and image/png, then the
+     * intent's type should be image/*.
+     * <p>
      * Optional standard extras, which may be interpreted by some recipients as
      * appropriate, are: {@link #EXTRA_EMAIL}, {@link #EXTRA_CC},
      * {@link #EXTRA_BCC}, {@link #EXTRA_SUBJECT}.