| commit | 0af43510cc45373614cdfce7d014283100e96cb9 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 16:59:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 16:59:43 2015 +0000 |
| tree | 2b79d422fe63ac6b23505f586eca4564055da08d | |
| parent | e3cb25078b814b40f8e1506514bd17066935a51f [diff] | |
| parent | 2562495de9338e14ca3a3ef74ce07a7b310cd1fb [diff] |
am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD * commit '2562495de9338e14ca3a3ef74ce07a7b310cd1fb': libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.