tree 2d1de1410cae399dbcdd39cafdff2b0d7c66f912
parent 3b30e72d5013cd89bff20852e9ff55eb0f5d6ad9
parent 86b1961a8d61086ef8d5475182f2a3cf4392b42c
author Andreas Huber <andih@google.com> 1346349816 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346349816 -0700

am 86b1961a: Merge "Prepare for transmitting audio through AudioSource." into jb-mr1-dev

* commit '86b1961a8d61086ef8d5475182f2a3cf4392b42c':
  Prepare for transmitting audio through AudioSource.