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