am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb

* commit '9a62d902ead8f94fa0ce071300e3767bfb976d8b':
  Some tweaks to HTTP live / nuplayer behaviour