tree 766ccf6a49864e976e6cb90f4d26ca5a8329b836
parent b235387cbd72d3e349ef512732c1447d9ef76e02
parent 962b2928b38c3f2ba6f371622b55ef4100e15cc3
author Nicholas Sauer <nicksauer@google.com> 1403039448 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403039448 +0000

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

* commit '962b2928b38c3f2ba6f371622b55ef4100e15cc3':
  Fix RTSP urls.