tree 4fe40931fd620cb597774e30a3489a6169df67bb
parent 384b69dfd8fc6755f7b7709a045ebb6a4efe9481
parent 27a14b22e03dbd677e100f273e359a0daf2e79c6
author Andreas Huber <andih@google.com> 1364314269 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1364314269 +0000

am 5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev

* commit '5d014f0fb4f7f20ed2f35a3c856b2d4e356f0beb':
  In "special" mode we now establish a UDP RTCP channel in addition to the