tree d862c8a9dc8a7e71754d5e01abec6d7a8439c7a5
parent d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1
parent 10004fe612bc38bedc258fd1c380ebccacfa0c1e
author Jean-Baptiste Queru <jbq@google.com> 1344880618 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344880618 -0700

am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"

* commit '10004fe612bc38bedc258fd1c380ebccacfa0c1e':
  amrnb: Fix audio distortion in an AMR-NB clip