| commit | a1491b43c50287ae781b6a7e838c844204837853 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 01:39:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:39:47 2015 +0000 |
| tree | d8c036fc7d38817cb4bea6ff593eea89285b0624 | |
| parent | 947c99179ad721732ab070e93b70f6c888da0993 [diff] | |
| parent | 7b0e6b0da99c19b40bc9b02735888c9711a47615 [diff] |
am 7b0e6b0d: am fe8f7943: am 2cb6f18d: am c7bf75c3: am 138f44a1: am 7d113a23: am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev * commit '7b0e6b0da99c19b40bc9b02735888c9711a47615': Revert "SoftAVCEnc: check requested memory size before allocation."