tree 73ff66c06401095bb8d9fc83f21a16e99a0165bc
parent 7b5564e251680275d810b5c34b5d9a3caebff0fb
parent e4223a8d324e03aec1130b166bf19367bd490b8f
author Wei Jia <wjia@google.com> 1449165404 +0000
committer android-build-merger <android-build-merger@google.com> 1449165404 +0000

DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597  -s ours
am: e4223a8d32

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