tree 5a3b867ae1a01dc543a235bb72908f5ef504a918
parent 76f7c0b19e1c9073a2f250ff5b9a5af3cf80b7e8
parent 313af69448d447993a952aca97f67535f55b5e11
author Youming Ye <paulye@google.com> 1555106822 -0700
committer android-build-merger <android-build-merger@google.com> 1555106822 -0700

Merge "Add MEDIA_TIMEOUT error for RTCP timeout"
am: 313af69448

Change-Id: Ieff5bc98a862baa19a5fdd64b9654ce48ed2bc08