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