commit 9f916def8ce39528ad2fe56a2b199fa61d6fe383
author Narayan Kamath <narayan@google.com> Fri Mar 07 19:23:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 19:23:56 2014 +0000
tree a8ed13a67e2dcb2e8816d4c3c0e129a9d3389f51
parent 15c0240f84924c1c2832a2676d7504d7845a0949
parent 31a98ad0da98227f3c76469e7a8a267c9539b6e8

am 31a98ad0: (-s ours) resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp

* commit '31a98ad0da98227f3c76469e7a8a267c9539b6e8':
  LiveSession: Use the actual, possibly redirected url as base in the M3U
  M3UParser: Skip query strings when looking for the last slash in a URL
  ChromiumHTTPDataSource: Keep track of the redirected URL
  Initial HLS seamless switch implementation.
  NuPlayer side support for seamless format switch.
  LiveSession refactor
  PlaylistFetcher: Add support for block-by-block decryption.
  LiveSession: Add support for block-by-block fetchFile.