tree 7c015593efd599b76760fa685b3ef564306f6af0
parent af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9
parent 54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0
author Nick Kralevich <nnk@google.com> 1439259998 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439259998 +0000

am 54d88fe2: am aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev

* commit '54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX