tree aaf81ad22aa19644922ef52c335733c9fcfad479
parent fcd20a8fbde4ee74cc1568f99645ac74a54e15f7
parent 58402c6d472f85ce6a82b8b84cf8836f7cb75d68
author Nicholas Sauer <nicksauer@google.com> 1403039952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403039952 +0000

am 58402c6d: am ac7f781a: am 962b2928: Merge "Fix RTSP urls." into jb-dev

* commit '58402c6d472f85ce6a82b8b84cf8836f7cb75d68':
  Fix RTSP urls.