tree d5fefeabf50ee9f7bccfc965f617a75084cbc4ad
parent 238a487a0cf0fde606a27ea1f00bad5d92589161
parent 0af43510cc45373614cdfce7d014283100e96cb9
author Wei Jia <wjia@google.com> 1440090434 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440090434 +0000

am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit '0af43510cc45373614cdfce7d014283100e96cb9':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.