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

* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
tree: caa611bce19db70a90586d6caa93bcf4ca6ec6ff
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/