tree e21c36514b2149b2422c9c99d6873b5d6f402992
parent 50b9a1eb110a0f6b95472b340d65bb5eb3589a64
parent 249f87d48a57a50480e41b397cb4ca31687abb34
author Iliyan Malchev <malchev@google.com> 1346191895 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346191896 -0700

Merge "audio: add the headset tx" into jb-mr1-dev