tree 2b79d422fe63ac6b23505f586eca4564055da08d
parent e3cb25078b814b40f8e1506514bd17066935a51f
parent 2562495de9338e14ca3a3ef74ce07a7b310cd1fb
author Wei Jia <wjia@google.com> 1440089983 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440089983 +0000

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

* commit '2562495de9338e14ca3a3ef74ce07a7b310cd1fb':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.