| commit | b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Aug 11 05:33:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 05:33:04 2015 +0000 |
| tree | 1a9c16f4f781850b3542ceeb354afad7ae649967 | |
| parent | 5aa85d05aaeb5509597b7876942b6f5e543a451c [diff] | |
| parent | f86b266c14d61887b91ba4cfd5e9531877ee455a [diff] |
am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev * commit 'f86b266c14d61887b91ba4cfd5e9531877ee455a': MPEG4Extractor.cpp: Add check for size == SIZE_MAX