diff options
author | Daniel Xie <dxie@google.com> | 2015-09-28 17:06:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-28 17:06:06 +0000 |
commit | 66b3ce6970f1462c81ddd7301914e60b3e8d663a (patch) | |
tree | 0471ac3cd7b796d0c7669722aa8281610962bd20 /luni/src/main/java/javax/crypto/CipherInputStream.java | |
parent | 92cec14754d8ad8d9018d0dcb3767663492bc8da (diff) | |
parent | 70a463cbfe0aac6bc88a46b3b103e40d70ff3abf (diff) | |
download | libcore-66b3ce6970f1462c81ddd7301914e60b3e8d663a.zip libcore-66b3ce6970f1462c81ddd7301914e60b3e8d663a.tar.gz libcore-66b3ce6970f1462c81ddd7301914e60b3e8d663a.tar.bz2 |
am 70a463cb: Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev
* commit '70a463cbfe0aac6bc88a46b3b103e40d70ff3abf':
Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318
Diffstat (limited to 'luni/src/main/java/javax/crypto/CipherInputStream.java')
0 files changed, 0 insertions, 0 deletions