| commit | 1e97d490810211c6cfd0f731b209dd7b1dc65db4 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 19:38:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:38:45 2015 +0000 |
| tree | 36381ac6347461e75e0231ba1a9e5e613a3b2095 | |
| parent | 4a31f533e4c08462c89f083cf5a5aea35c71056d [diff] | |
| parent | 7c6a8141b4ceac5d343ab14cc025411c845a83d2 [diff] |
am 7c6a8141: am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev * commit '7c6a8141b4ceac5d343ab14cc025411c845a83d2': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.