| commit | 0fcf36b10d00315db85569b41b554200b702cdeb | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 13 17:43:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 17:43:57 2015 +0000 |
| tree | 96c8b23b897cb2600db49754545b8d8362399f4b | |
| parent | f0ff2fbeef8fa05159b3a6cda43f65e0234ff925 [diff] | |
| parent | 835988a0ecabf674357774fb89840309120da498 [diff] |
am 835988a0: am e1d095fa: Merge "MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX" * commit '835988a0ecabf674357774fb89840309120da498': MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX