commit | 96714b68eaa9c2448e97f660d88be5fd9c3ed134 | [log] [tgz] |
---|---|---|
author | Simon Wilson <simonwilson@google.com> | Sun Sep 30 19:54:40 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Sep 30 19:54:41 2012 -0700 |
tree | 3ba696da406421c29d42cce36855073bd3cdcfb1 | |
parent | b9928aa5403913efc471f8e915d5b258caf15589 [diff] | |
parent | ea1f822f144007b85679f489c2b3134d9af42b83 [diff] |
Merge "audio: mux audio from AIF2 for BT mic/uplink" into jb-mr1-dev