summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-12-10 15:11:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 15:11:43 -0800
commitd9f9980541cf95e316f952e19e0f36ac8dc968e8 (patch)
tree58fe48ec2a7e73e07b0c639c2c34141ee39914ff /include/ScopedJavaUnicodeString.h
parent11173387202f799fad05bf696b81ca7f379e11dc (diff)
parentcb245d2936763d1bea1842774fe51f178a0fa697 (diff)
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
am: cb245d2936 * commit 'cb245d2936763d1bea1842774fe51f178a0fa697':
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions