summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-24 13:08:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 13:08:12 -0700
commitcb767c3a8ff01000480db9ad851fafb8a3abd267 (patch)
treeb567812b56af090d603af3559d9bfb7909e1bfaf
parent58cb201c89bfc9e1d6b4c9a401185d24451cfcf6 (diff)
parent008eb65f170aecb25d674cb47a8fcd3edd8b6b8e (diff)
downloadmms-cb767c3a8ff01000480db9ad851fafb8a3abd267.tar.gz
am 008eb65f: am e158afc2: Merge ""audio/mp4" missing from array of supported content types."
* commit '008eb65f170aecb25d674cb47a8fcd3edd8b6b8e': "audio/mp4" missing from array of supported content types.
-rw-r--r--src/java/com/google/android/mms/ContentType.java1
1 files changed, 1 insertions, 0 deletions
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 @@ public class ContentType {
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);