summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordxie@google.com <dxie@google.com>2015-09-29 05:05:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-29 05:05:01 +0000
commitafe2e6ce54af43d0539bf82f94f918cc2dee767c (patch)
tree6770798b4a4f67f62a5450ac91c94dc8f51a197a
parentebc4ca8222be974b201fe35e599533f99a0c1915 (diff)
parent6823274059649ba07e28a4ff4fe09bbeb0bca438 (diff)
downloadlibcore-afe2e6ce54af43d0539bf82f94f918cc2dee767c.zip
libcore-afe2e6ce54af43d0539bf82f94f918cc2dee767c.tar.gz
libcore-afe2e6ce54af43d0539bf82f94f918cc2dee767c.tar.bz2
am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev
* commit '6823274059649ba07e28a4ff4fe09bbeb0bca438': 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