tree 91d2a4e031a6f482f35ece5c61489344979255e0
parent c34b6d4bd43eaae242b996331e9b9335a95b897c
parent 8a2dd589e160d9299df0d1ff7714a07bdaf12c02
author Jon Larimer <jlarimer@google.com> 1438374220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438374220 +0000

am 8a2dd589: Merge "Fix integer overflow when handling MPEG4 tx3g atom"

* commit '8a2dd589e160d9299df0d1ff7714a07bdaf12c02':
  Fix integer overflow when handling MPEG4 tx3g atom