| commit | 138f44a1de740fb6b3a3491c30a11dc8f6ca5f81 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 18 01:59:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 01:59:47 2015 +0000 |
| tree | 6b0ae7687dd4ce0467ad8ec5b3bf272756674e14 | |
| parent | 3175ff3f343ecd85700e2029d7709ce960272967 [diff] | |
| parent | 7d113a238871413e9bef15a2aa40731e56127a40 [diff] |
am 7d113a23: am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev * commit '7d113a238871413e9bef15a2aa40731e56127a40': Revert "SoftAVCEnc: check requested memory size before allocation."