commit 8d1caa026caef3673799481c5fba454306f831e9
author Lajos Molnar <lajos@google.com> Fri Mar 07 02:42:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:42:14 2014 +0000
tree 654e8de748a437c7d25550381ff7c0c8015fe40e
parent 04352de2e32d6dc0901436951f69357f5cd8655c
parent 49ea13379fb15ddb73183ebafa3a377342ef932f

am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev

* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
  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.