tree 73ff66c06401095bb8d9fc83f21a16e99a0165bc
parent e4223a8d324e03aec1130b166bf19367bd490b8f
parent 862b693ba3c2abaed66968385d3d7d4a3dd70cb3
author Wei Jia <wjia@google.com> 1449166008 +0000
committer android-build-merger <android-build-merger@google.com> 1449166008 +0000

DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1  -s ours am: 4c0d243626
am: 862b693ba3  -s ours

* commit '862b693ba3c2abaed66968385d3d7d4a3dd70cb3':
  DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.