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