bb70837397
Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp * commit '949f7d9066e09768e570686a5695aaba4a1dafd0': Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.