am 5301f272: am 50dbdc80: am f271ddd4: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into mnc-dev
* commit '5301f272':
libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.