| commit | 3704d6b33896323763f08f8955b918e75cd4a21e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Aug 11 05:45:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 11 05:45:30 2015 +0000 |
| tree | 02f5377820239041efcbf9e0ca6be7e4a92867b7 | |
| parent | a3474637353226e0649016e1a0ec0e5ca4660918 [diff] | |
| parent | c94caa14f8acb9f2f1010c34e7a40a51bf17b63b [diff] |
am c94caa14: am b07c4a8d: am f86b266c: am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev * commit 'c94caa14f8acb9f2f1010c34e7a40a51bf17b63b': MPEG4Extractor.cpp: Add check for size == SIZE_MAX