tree 578b0aa02974b2dc51c7fc59327ad5d79f96ebf3
parent ff0c114eae58a2133d7ec827f670b4478489210c
parent 2c7411483b098a84de41f56c2bce6ff8518ff7a2
author Wei Jia <wjia@google.com> 1449166837 +0000
committer android-build-merger <android-build-merger@google.com> 1449166837 +0000

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

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