diff options
| author | dxie@google.com <dxie@google.com> | 2015-09-29 04:50:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 04:50:43 +0000 |
| commit | 9073d215346226f7ddaefa0dfe805153e84f2865 (patch) | |
| tree | 299434f810e5e249959f228350541098f1d84f92 /libart/src | |
| parent | cd8cc93f3558fde16bf25669cb9a57522c8b223a (diff) | |
| parent | ba1b44d5f54cb3c61ff4747dc356dfc7be614972 (diff) | |
| download | libcore-9073d215346226f7ddaefa0dfe805153e84f2865.zip libcore-9073d215346226f7ddaefa0dfe805153e84f2865.tar.gz libcore-9073d215346226f7ddaefa0dfe805153e84f2865.tar.bz2 | |
am ba1b44d5: resolved conflicts for a18ebd19 to klp-modular-dev
* commit 'ba1b44d5f54cb3c61ff4747dc356dfc7be614972':
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
Diffstat (limited to 'libart/src')
0 files changed, 0 insertions, 0 deletions