am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread

Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63'

* commit '2d00c6050977f3e03665fbfef93f4f6aed041a63':
  If we encounter video stream EOS while seeking we may still need to seek audio.
tree: 5026e6f89f12c1ba8f67d9249c51c2a427827270
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/