tree e18496aadec99381b1aafa428bc35de153f0eec7
parent 2d1a4c52f9781e7f2bbbfde8550d1268eee80d9e
parent 5f567f13b76dc6b2e1bfe3d279fbac0427704a09
author Jean-Baptiste Queru <jbq@google.com> 1349886711 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349886711 -0700

am 5f567f13: Merge "Panda: Add media codecs for Audio"

* commit '5f567f13b76dc6b2e1bfe3d279fbac0427704a09':
  Panda: Add media codecs for Audio