tree 6a2fa0bff20e05b1192d04a4cc8efd9726ccb99a
parent b788e87dab46387953baa046f32b1ae1802261f0
parent 0acb2064d7080ab1b3d993cfad66fbf852f9663a
author Jean-Michel Trivi <jmtrivi@google.com> 1336553121 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553121 -0700

am 0acb2064: Merge "Make audio downmixer part of the core platform" into jb-dev

* commit '0acb2064d7080ab1b3d993cfad66fbf852f9663a':
  Make audio downmixer part of the core platform