tree 238c93c5793a752315de41882a69063fefb1207b
parent 90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d
parent 6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2
author Wei Jia <wjia@google.com> 1439862788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439862788 +0000

am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev

* commit '6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2':
  Revert "SoftAVCEnc: check requested memory size before allocation."