tree b567812b56af090d603af3559d9bfb7909e1bfaf
parent d6de726692d8a420faae86300bc9e87c30733730
parent e158afc25e4a2b0d6a6c3e4403a5d82a12329493
author Jean-Baptiste Queru <jbq@google.com> 1345838778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345838778 -0700

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

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