tree 65c2cc7a6171ec1aa7d4088167da13a4da76c582
parent e4ccf3a14beabfeeb6c7df47ae118f3db999c1ce
parent bce77a36125b25ce864b40bd5938ca89becea898
author Nick Kralevich <nnk@google.com> 1438988943 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438988943 +0000

am bce77a36: am 0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX

* commit 'bce77a36125b25ce864b40bd5938ca89becea898':
  MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX