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