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