tree b4f90988aa64a88210ffac837d8b0bf483677afd
parent 5fec424c749e48040db3ce915dbb42172c3ad1da
parent 1bbf2488ba4d9b5230f0274308bdd5bffb2ffeb3
author Abhishek Arya <aarya@google.com> 1440040623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440040623 +0000

am 1bbf2488: Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets." into mnc-dev

* commit '1bbf2488ba4d9b5230f0274308bdd5bffb2ffeb3':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.