am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1

* commit '1a47fc353157bf9798c8a7425f106681e14bf4a5':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
tree: f8a7e3ce886a684456a7f1daa437c37946e224d7
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/