tree bb93b32770b9a84389e619711b84d4df7c36814d
parent 20d62aae49e76fc49476378b80ef31d0f4931120
parent 945f4eea51d747fc15f1e24791a60d44cb4c96ef
author Wei Jia <wjia@google.com> 1464921094 +0000
committer android-build-merger <android-build-merger@google.com> 1464921094 +0000

Merge "RTSP: add timeout scheme to handle error cases." into nyc-dev am: 4cf0436f20 am: 1508809cf9
am: 945f4eea51

* commit '945f4eea51d747fc15f1e24791a60d44cb4c96ef':

Change-Id: I62b01c75fc655f5d124595557c060c4a95ea88e0