commit 008eb65f170aecb25d674cb47a8fcd3edd8b6b8e
author Jean-Baptiste Queru <jbq@google.com> Fri Aug 24 13:06:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 24 13:06:18 2012 -0700
tree b567812b56af090d603af3559d9bfb7909e1bfaf
parent d6de726692d8a420faae86300bc9e87c30733730
parent e158afc25e4a2b0d6a6c3e4403a5d82a12329493

am e158afc2: Merge ""audio/mp4" missing from array of supported content types."

* commit 'e158afc25e4a2b0d6a6c3e4403a5d82a12329493':
  "audio/mp4" missing from array of supported content types.

src/java/com/google/android/mms/ContentType.java

diff --git a/src/java/com/google/android/mms/ContentType.java b/src/java/com/google/android/mms/ContentType.java
index 12a1343..51e52be 100644
--- a/src/java/com/google/android/mms/ContentType.java
+++ b/src/java/com/google/android/mms/ContentType.java
@@ -100,6 +100,7 @@
         sSupportedContentTypes.add(AUDIO_MID);
         sSupportedContentTypes.add(AUDIO_MIDI);
         sSupportedContentTypes.add(AUDIO_MP3);
+        sSupportedContentTypes.add(AUDIO_MP4);
         sSupportedContentTypes.add(AUDIO_MPEG3);
         sSupportedContentTypes.add(AUDIO_MPEG);
         sSupportedContentTypes.add(AUDIO_MPG);