tree 7d47bab47cc5bf6cb0b12baad8e36ec32856621d
parent 643c60094709d0569c44f5810c1895ed70b92cc9
parent cbb2aad7a8aced67d2d97e03d8cd78b1a843290c
author Andreas Huber <andih@google.com> 1364233130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1364233130 +0000

am 09bfd026: Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev

* commit '09bfd026b9f4fe004cba05e2eaf2dee38913bc7e':
  Separate the mode of the RTP and RTCP channels.