tree 7f8e8a9675b7c9a1b4814e292ef274b57ee956b9
parent 871bcd9dbc9b2642e51dd586119885c54b94357b
parent 3e3d641c612fc6bacd367be696ae6125009d18d3
author Jean-Baptiste Queru <jbq@google.com> 1339178020 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339178020 -0700

am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
  Added mpga as valid MediaFile extension