OSDN Git Service

am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory...
authorWei Jia <wjia@google.com>
Tue, 18 Aug 2015 01:53:08 +0000 (01:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 01:53:08 +0000 (01:53 +0000)
commit7d113a238871413e9bef15a2aa40731e56127a40
tree238c93c5793a752315de41882a69063fefb1207b
parent90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d
parent6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2
am 6d59c11c: (-s ours) am fc8c226b: Merge "Revert "SoftAVCEnc: check requested memory size before allocation."" into klp-dev

* commit '6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2':
  Revert "SoftAVCEnc: check requested memory size before allocation."