OSDN Git Service

am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD
authorWei Jia <wjia@google.com>
Thu, 20 Aug 2015 16:59:43 +0000 (16:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 16:59:43 +0000 (16:59 +0000)
commit0af43510cc45373614cdfce7d014283100e96cb9
tree2b79d422fe63ac6b23505f586eca4564055da08d
parente3cb25078b814b40f8e1506514bd17066935a51f
parent2562495de9338e14ca3a3ef74ce07a7b310cd1fb
am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

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