commit cb245d2936763d1bea1842774fe51f178a0fa697
author Daniel Xie <dxie@google.com> Sun Dec 06 05:44:10 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sun Dec 06 05:44:10 2015 +0000
tree 6770798b4a4f67f62a5450ac91c94dc8f51a197a
parent c5a96cff51ad9948b4fa392fdbbbdce02c9c037e
parent bcd9db7050124d4d8bbd9b732f43efd3291b4aa4

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 am: 70a463cbfe  -s ours
am: bcd9db7050

* commit 'bcd9db7050124d4d8bbd9b732f43efd3291b4aa4':
  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