tree 3b8f9bd7d8caab7cdd2e58ad5a918619938db9a3
parent d3969a64203bc6134c739ee6dca52615b8985e96
parent 0dc95be53182d7248d0af32f3025097171100204
author Nick Kralevich <nnk@google.com> 1428713740 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428713740 +0000

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