am a478723e: (-s ours) am 424eaef5: Merge "DO NOT MERGE: Prevent crash at...
am a478723e: (-s ours) am 424eaef5: Merge "DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream" into mnc-dev
* commit 'a478723e':
DO NOT MERGE: Prevent crash at erroneous MPEG2TS bitstream