| commit | ddb63b46279a1bb3698cebb6c744013fc3bb17e2 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 19:38:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:38:46 2015 +0000 |
| tree | a4fa0e984cdcd3e512d5501e2e7eb08becf54c58 | |
| parent | 1e97d490810211c6cfd0f731b209dd7b1dc65db4 [diff] | |
| parent | f8f0e0b756b0f96eccc94af89a0087c146232b26 [diff] |
am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD * commit 'f8f0e0b756b0f96eccc94af89a0087c146232b26': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.