tree 3a3fba7ca8017759468d59fc1b5f6fa75a5e5432
parent 8280f93403bfd5d5e24ebfb969f22e2e5d36f85e
parent b707cf22cf700e28f54c58cba8eeb38538735510
author Jean-Michel Trivi <jmtrivi@google.com> 1350357483 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350357483 -0700

am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev

* commit 'b707cf22cf700e28f54c58cba8eeb38538735510':
  Remote audio submix always has priority for media, only plays media