tree 7dcf27d59c46667f171e8bbeb5dccdbb536b515a
parent 123a2deac738bc9c3a1cc35cd3dc7f8f91302c36
parent d202ac37fc1f5f31e180af55cebd22810a80251b
author Eric Laurent <elaurent@google.com> 1415071679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415071679 +0000

am d202ac37: am b7092547: Merge "remove some restrictions on effect output channels" into lmp-mr1-dev automerge: ed1e55c

* commit 'd202ac37fc1f5f31e180af55cebd22810a80251b':
  remove some restrictions on effect output channels