tree e97daa06c690ad9088b5806c4a53df8cbb80459e
parent 1def7da83489bbf183b0b2b0da5ec9f786ab4bfb
parent 2d6a8767884c7a78af815309c3ad525e41d0fd7b
author Nicholas Sauer <nicksauer@google.com> 1403042141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403042141 +0000

am 2d6a8767: am 2eb76457: am 74c8e33f: am 5dd1abb2: am a6d91ec0: am 6441dad1: am 407c5397: am 58402c6d: am ac7f781a: am 962b2928: Merge "Fix RTSP urls." into jb-dev

* commit '2d6a8767884c7a78af815309c3ad525e41d0fd7b':
  Fix RTSP urls.