| commit | ab33de61ccf1d0fab39573a79cf8372045bbda1a | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 18 01:39:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 01:39:39 2015 +0000 |
| tree | ffa0f8acea31da78f2c73f61bb64e0dc80f08d48 | |
| parent | 2c0adb690ad2057d753a1d6892e9534e1648651b [diff] | |
| parent | 78df80c26352bdbe3dc3725a6d937f60fc340127 [diff] |
am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD * commit '78df80c26352bdbe3dc3725a6d937f60fc340127': SoftAVCEnc: check requested memory size before allocation.