| commit | d641c70af840300f7c7c3f686a7fe03d80bb0291 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 20:10:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:10:37 2015 +0000 |
| tree | 02759f20bff4fdf8e6f00b6ca73812b19b317cfa | |
| parent | 8c55f6e19d02c5959f78c46bd19297d1ab0cd5be [diff] | |
| parent | 79c7207e77a9dd510bc4f9e3445fbf5e715e2dbb [diff] |
am 79c7207e: am 01afbf07: am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into klp-dev * commit '79c7207e77a9dd510bc4f9e3445fbf5e715e2dbb': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.