tree 38169e6c54e9769c02e415d640996542a386e819
parent bce77a36125b25ce864b40bd5938ca89becea898
parent aa8dab77aa9ef1bb6e5414ee5e773001de725bef
author Nick Kralevich <nnk@google.com> 1439259600 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439259600 +0000

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

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