| commit | d1c5cb559085e4c6663f6e1e8b4bffae0bc85db3 | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Thu Aug 27 05:21:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:21:28 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | f15e1d74366d23ac8561a3923e70e58745cb7769 [diff] | |
| parent | 0fcf36b10d00315db85569b41b554200b702cdeb [diff] |
am 0fcf36b1: (-s ours) am 835988a0: am e1d095fa: Merge "MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX" * commit '0fcf36b10d00315db85569b41b554200b702cdeb':