commit 61c50eba62b55b3c1df4feb9125a4dd89b8c3d31
author Marco Nelissen <marcone@google.com> Wed Sep 05 19:23:36 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 05 19:23:36 2012 -0700
tree a44b9619f2060ec826c970afecef8d2ba9562b99
parent 3fd1ce46c2192f18e577d1693ce0eb19701564d1
parent 2ae8964ecd5f2b9668425394bd651bf2e715b33e

am 2ae8964e: am 74262b57: Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev

* commit '2ae8964ecd5f2b9668425394bd651bf2e715b33e':
  To support .mxmf which is specified in Android CDD.

media/libmediaplayerservice/MediaPlayerFactory.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerFactory.cpp b/media/libmediaplayerservice/MediaPlayerFactory.cpp
index f821cc3..3f69c11 100644
--- a/media/libmediaplayerservice/MediaPlayerFactory.cpp
+++ b/media/libmediaplayerservice/MediaPlayerFactory.cpp
@@ -246,6 +246,7 @@
                                                  ".midi",
                                                  ".smf",
                                                  ".xmf",
+                                                 ".mxmf",
                                                  ".imy",
                                                  ".rtttl",
                                                  ".rtx",