tree a5f988bb286a3ccf0e6731c15aef93c96d04db26
parent 4791a6d99231084ec8373a9646a9947eef270b1c
parent 10f6b17a29f7d39303b4779929d15c540ee87290
author Joshua J. Drake <android-open-source@qoop.org> 1438666705 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438666705 +0000

am 10f6b17a: am d053da7b: am a9f1e993: am 134dc311: am 80a6d9f3: am e10c2e62: am 74ebcd65: am 272f4056: am 52302d91: am f354c48e: am 5c4428f6: Fix integer overflow during MP4 atom processing

* commit '10f6b17a29f7d39303b4779929d15c540ee87290':
  Fix integer overflow during MP4 atom processing