aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordxie@google.com <dxie@google.com>2015-09-29 04:56:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-29 04:56:23 +0000
commitc43d70e6f6b03d1d25dc8cd8f2ee0bc85284cfa7 (patch)
tree299434f810e5e249959f228350541098f1d84f92
parent3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9 (diff)
parent9073d215346226f7ddaefa0dfe805153e84f2865 (diff)
downloadlibcore-c43d70e6f6b03d1d25dc8cd8f2ee0bc85284cfa7.tar.gz
am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev
* commit '9073d215346226f7ddaefa0dfe805153e84f2865': 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