| commit | f076fabff7a518ed5668a9a1be03dd729b8cbfb6 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 17:07:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 17:07:14 2015 +0000 |
| tree | d5fefeabf50ee9f7bccfc965f617a75084cbc4ad | |
| parent | 238a487a0cf0fde606a27ea1f00bad5d92589161 [diff] | |
| parent | 0af43510cc45373614cdfce7d014283100e96cb9 [diff] |
am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD * commit '0af43510cc45373614cdfce7d014283100e96cb9': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.