am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a...
am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
* commit 'e00e0485':
Buffer at least 2 secs worth of data at startup of after a seek before