tree 7197300b2129cfc3e7252d89d4347f24429cb659
parent 9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad
parent 186d1fb9b72439c1c3317d72e4a0f52f466e6861
author Nick Kralevich <nnk@google.com> 1439260637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439260637 +0000

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

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