| commit | 4c2b6afb11a715b710dc97461b4eb8c265c408b1 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Apr 11 00:55:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 11 00:55:40 2015 +0000 |
| tree | 3b8f9bd7d8caab7cdd2e58ad5a918619938db9a3 | |
| parent | d3969a64203bc6134c739ee6dca52615b8985e96 [diff] | |
| parent | 0dc95be53182d7248d0af32f3025097171100204 [diff] |
am 0dc95be5: am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '0dc95be53182d7248d0af32f3025097171100204': Fix integer overflow during MP4 atom processing