am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the...
am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
* commit '4b40f7ef':
ACodec now signals an error if the mediaserver died while it is in