| commit | 7f6a36d20afb6383e5e46cdfa4a9e056c99c18e8 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Aug 11 05:11:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 05:11:59 2015 +0000 |
| tree | 58d662fb505e40bc0af516d2e85882d14650d2e1 | |
| parent | c88ddfc09338969a4c8fc32be1d3dffb9022a237 [diff] | |
| parent | b6131acd69ea32df926125d94c16174bc0ce1d4a [diff] |
am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev * commit 'b6131acd69ea32df926125d94c16174bc0ce1d4a': MPEG4Extractor.cpp: Add check for size == SIZE_MAX