am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
tree: f604c04099e2f0a8ad9edcf4adece1f4c68e577e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/