| commit | c7bf75c3913abf79db6ac46ab9eeaff0c55e74c4 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 18 02:08:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 02:08:48 2015 +0000 |
| tree | 42717030112c90492edab0416a7aef9fbc4bfdd2 | |
| parent | 46f7acbb3d323a3f67ba1f91494b7466676b7122 [diff] | |
| parent | 138f44a1de740fb6b3a3491c30a11dc8f6ca5f81 [diff] |
am 138f44a1: am 7d113a23: am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev * commit '138f44a1de740fb6b3a3491c30a11dc8f6ca5f81': Revert "SoftAVCEnc: check requested memory size before allocation."