tree 461e9752512d0c29b374190666de816e12ad2f9e
parent ed017f02bfdb1d6a1cc86d76144724e45c9f1b4b
parent 59aca1ae3126944b13e88b00a41e5c9011a20631
author Nicholas Sauer <nicksauer@google.com> 1403042467 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403042467 +0000

am 59aca1ae: 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 '59aca1ae3126944b13e88b00a41e5c9011a20631':
  Fix RTSP urls.