tree 0b130d93354829f3382add68f7c68c4ab5345462
parent 55fddda7ae1cee9de86446e1842e072349de1bc4
parent 61b0ca86d3d853172ccc147256a64a9fd2ba6606
author Jean-Michel Trivi <jmtrivi@google.com> 1337960564 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337960564 -0700

am 61b0ca86: am c9d0294e: Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev

* commit '61b0ca86d3d853172ccc147256a64a9fd2ba6606':
  Prevent occurences of clipping in loud downmixed scenes