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