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