| commit | e4bcb3f8d444a11afad90b22fbde051c81c295c8 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 04:42:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 04:42:43 2015 +0000 |
| tree | 9d1b0fdc138a7e41ce7bbf69c8c599e5e4187f52 | |
| parent | 3dcb448f52cf05e7e0434c28bade68e898707053 [diff] | |
| parent | 238a487a0cf0fde606a27ea1f00bad5d92589161 [diff] |
am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable." into lmp-dev * commit '238a487a0cf0fde606a27ea1f00bad5d92589161': libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in SampleTable.