am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS...
am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '624efe45':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...