am 949f7d90: Merge "Work to support switching transport streams mid-stream and...

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

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

* commit '949f7d90':
  Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.