| commit | 2165ab1ee5ac82a45e66818bfd01c14767721198 | [log] [tgz] |
|---|---|---|
| author | dxie@google.com <dxie@google.com> | Tue Sep 29 05:21:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 05:21:18 2015 +0000 |
| tree | 03297e72990034032b882569fc20dc5cab96e2e4 | |
| parent | dbdcd7fd6f376e410818c0aed1ad9319dd504762 [diff] | |
| parent | ef93e2f34a0ad920d8d3b35d2afa5ac281c1eed8 [diff] |
am ef93e2f3: am 73e64b14: am afe2e6ce: am 68232740: am c43d70e6: am 9073d215: am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev * commit 'ef93e2f34a0ad920d8d3b35d2afa5ac281c1eed8': 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