tree a8f1f3d6913f6dc4ff25366814f6348fcc8ea638
parent ef2c6e044676bf9f0ead4359d7a1840236150e4d
parent 33235986a7490b569c859e5555328cbe1bae2748
author Abhishek Arya <aarya@google.com> 1439903697 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439903697 +0000

am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '33235986a7490b569c859e5555328cbe1bae2748':
  libstagefright: check memory size for overflow before allocation.