diff options
author | Wei Jia <wjia@google.com> | 2015-08-18 01:53:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 01:53:08 +0000 |
commit | 7d113a238871413e9bef15a2aa40731e56127a40 (patch) | |
tree | 238c93c5793a752315de41882a69063fefb1207b /media/libstagefright/foundation | |
parent | 90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d (diff) | |
parent | 6d59c11c0dfa5aee2ebbadcf282b512cb55be9c2 (diff) | |
download | frameworks_av-7d113a238871413e9bef15a2aa40731e56127a40.zip frameworks_av-7d113a238871413e9bef15a2aa40731e56127a40.tar.gz frameworks_av-7d113a238871413e9bef15a2aa40731e56127a40.tar.bz2 |
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."
Diffstat (limited to 'media/libstagefright/foundation')
0 files changed, 0 insertions, 0 deletions