tree e5078ed566e1e69604ea697e55bc5b3dbe672799
parent 652926c8a37fb904aaa0756a0d0bae0574f308c5
parent fc8c226b75a45876e6545c3a217698ada52bd2d6
author Wei Jia <wjia@google.com> 1439859189 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439859189 +0000

am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev

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