tree 8a1176866631f295dae0b5bd11ca1929d3a61222
parent 8e842556b0b69332521b9fc5744ba40286fcf088
parent b26105c04508f32528f59dd66b78d1e0858fe90e
author Andreas Huber <andih@google.com> 1336086791 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336086791 -0700

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

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