aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordxie@google.com <dxie@google.com>2015-09-29 05:01:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-29 05:01:17 +0000
commit6823274059649ba07e28a4ff4fe09bbeb0bca438 (patch)
tree6770798b4a4f67f62a5450ac91c94dc8f51a197a
parentc5a96cff51ad9948b4fa392fdbbbdce02c9c037e (diff)
parentc43d70e6f6b03d1d25dc8cd8f2ee0bc85284cfa7 (diff)
downloadlibcore-6823274059649ba07e28a4ff4fe09bbeb0bca438.tar.gz
am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev
* commit 'c43d70e6f6b03d1d25dc8cd8f2ee0bc85284cfa7': 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
0 files changed, 0 insertions, 0 deletions