| commit | 801d2d69a20cb9fc9cfbcebe382c0381926dc3fe | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Aug 27 05:22:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:22:52 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | baa409349c44ba0a477087e68715a045ba4b15f5 [diff] | |
| parent | 00c1ad5d62d14e94f979042563239195cda72541 [diff] |
am 00c1ad5d: (-s ours) am 9791b355: am 6e2d27a9: am d3d84fe6: am 374e600c: am 0a427176: am d3b0f865: am ce380290: (-s ours) am 567b6551: Merge "SoftAVCEnc: check requested memory size before allocation." into klp-dev * commit '00c1ad5d62d14e94f979042563239195cda72541':