tree aa74eecfc384795dc4968bde326ce0fdbf96c5be
parent 8dad284a8ac588ef0be92c6a467e525f07c164cd
parent 4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae
author Marco Nelissen <marcone@google.com> 1392917237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392917237 +0000

am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"

* commit '4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae':
  LiveSession: Use the actual, possibly redirected url as base in the M3U