am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp

* commit '949f7d9066e09768e570686a5695aaba4a1dafd0':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
tree: 6345839c3d83daea788ff7ed31d5e0469bcfcc49
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/