tree 4fe40931fd620cb597774e30a3489a6169df67bb
parent bbef2b3f42de20c7d2a920de62d3d1eca40e054f
parent dca73b8fe8fa4d991e1a78c02f1939aaeb673cc1
author Andreas Huber <andih@google.com> 1364314129 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364314130 +0000

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