| commit | ca12af3ff5b7b9c37150209f6369ec511e010ffa | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Jun 30 22:03:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 22:03:18 2015 +0000 |
| tree | db30e092fc70a771b08fdf1e7dbfebf37150836e | |
| parent | ac85eb2ce87fd3a58931c119bd2209285b9a8c98 [diff] | |
| parent | 2d80c0a13c40f29d2a4b4aca8765705cbb4b2fe8 [diff] |
am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev * commit '2d80c0a13c40f29d2a4b4aca8765705cbb4b2fe8': Prevent integer overflow when processing covr MPEG4 atoms