tree 8a1176866631f295dae0b5bd11ca1929d3a61222
parent 878044b88a088ca021fdfa113150e7a2233a8f16
parent f53c36c6463d899895719b8b17ba45bd2d552cee
author Andreas Huber <andih@google.com> 1336086646 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336086646 -0700

am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev

* commit 'f53c36c6463d899895719b8b17ba45bd2d552cee':
  Respect channel mask in ACodec and NuPlayer.