| commit | 0cbb4a75474b7b4453895b79fa95f6f29e3cf92f | [log] [tgz] |
|---|---|---|
| author | Jon Larimer <jlarimer@google.com> | Sat Aug 01 15:48:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 15:48:24 2015 +0000 |
| tree | 00de5e85a4e3d5aac9737c0921e943a056d6e301 | |
| parent | f51567e730ecc6e3d64e534d0056614c59e5cfb5 [diff] | |
| parent | 4eba6fd38a27c3475cc46064fba7658c96f19809 [diff] |
am 4eba6fd3: (-s ours) am 800e479f: Merge "Prevent integer overflow when processing covr MPEG4 atoms" * commit '4eba6fd38a27c3475cc46064fba7658c96f19809': Prevent integer overflow when processing covr MPEG4 atoms