| commit | 091f313aa0fe7c892b74f637c28f4a41c9dfd70a | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 20 02:04:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 02:04:27 2015 +0000 |
| tree | ac585096ef12cbde9c2180b54f66eb35327f0e99 | |
| parent | 3b64d3a0b21c4d8046eec44104f7ce7ea9ce70fa [diff] | |
| parent | a1491b43c50287ae781b6a7e838c844204837853 [diff] |
am a1491b43: 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 'a1491b43c50287ae781b6a7e838c844204837853': Revert "SoftAVCEnc: check requested memory size before allocation."