tree 7197300b2129cfc3e7252d89d4347f24429cb659
parent d9d35098aaaa546d79d0707734aac9b4b12c5be1
parent f4dfe12ecd26e7d6965a2abc062709b6d7d942c4
author Nick Kralevich <nnk@google.com> 1439260369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439260369 +0000

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

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