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