Merge branch 'readonly-p4-donut' into donut

This commit is contained in:
Andy Stadler 2009-05-04 10:31:00 -07:00 committed by The Android Open Source Project
commit 9391a604e4

View File

@ -64,9 +64,7 @@ public class Email extends Application {
* The MIME type(s) of attachments we're willing to view. * The MIME type(s) of attachments we're willing to view.
*/ */
public static final String[] ACCEPTABLE_ATTACHMENT_VIEW_TYPES = new String[] { public static final String[] ACCEPTABLE_ATTACHMENT_VIEW_TYPES = new String[] {
"image/*", "*/*",
"audio/*",
"text/*",
}; };
/** /**