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