tree 81b550847bc49f1625eeb3f194f8efc65036bdb8
parent 4b995f73b581ce0705b537317f32ad76bddb55fa
parent a590baca031199327f6382347625dd232de2c95c
author Wei Jia <wjia@google.com> 1440089621 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440089621 +0000

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

* commit 'a590baca031199327f6382347625dd232de2c95c':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.