| commit | c0daadf889bf589cdbb0bf7a35044e4df5f94c9a | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Mar 07 22:59:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 22:59:21 2014 +0000 |
| tree | 14bc41fc4b9fbc608f4ff4e26d9bb19f6dadb96e | |
| parent | 7c02f5303f20e95ec4511aec81f4f24b96d0cfd9 [diff] | |
| parent | 4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae [diff] |
am 4ee5d2b9: (-s ours) 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