OSDN Git Service

am a590baca: Merge commit \'6ae815e0\' into HEAD
authorWei Jia <wjia@google.com>
Thu, 20 Aug 2015 16:53:41 +0000 (16:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 16:53:41 +0000 (16:53 +0000)
commit2562495de9338e14ca3a3ef74ce07a7b310cd1fb
tree81b550847bc49f1625eeb3f194f8efc65036bdb8
parent4b995f73b581ce0705b537317f32ad76bddb55fa
parenta590baca031199327f6382347625dd232de2c95c
am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'a590baca031199327f6382347625dd232de2c95c':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
media/libstagefright/MPEG4Extractor.cpp