am 6b37cd72: am 6701a449: Merge "Audio and video bitrate are now configurable...
am 6b37cd72: am 6701a449: Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
* commit '6b37cd72':
Audio and video bitrate are now configurable through system properties