| commit | b2a5deecaddc43a605644d5548b608d868e1d997 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 13 17:44:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 13 17:44:23 2015 +0000 |
| tree | 74b5f4fab97a085481739c9db88e45771e46545a | |
| parent | 5c4a35a9f58bd97b44e0905639b7f4f20d92cda0 [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