tree b567812b56af090d603af3559d9bfb7909e1bfaf
parent 58cb201c89bfc9e1d6b4c9a401185d24451cfcf6
parent 008eb65f170aecb25d674cb47a8fcd3edd8b6b8e
author Jean-Baptiste Queru <jbq@google.com> 1345838892 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345838892 -0700

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.