summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2016-06-22 19:58:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 19:58:42 +0000
commit44db59190dabf29df324e4e075775e6157286942 (patch)
treee889b9d606f2cb0f1c4f45c9f92d66f1c9745dff /include/ScopedJavaUnicodeString.h
parente34fbfb66a724284a9722892fa8f51f7c663ed86 (diff)
parent49464bb3d4513fb65fe8966dd296b41bd29331e9 (diff)
Merge \\\\\\\\\\\"Use SSL_session_reused to check when a session was reused\\\\\\\\\\\" into klp-dev am: 177d0627fb am: 4a39b13c99 -s ours am: cdabca72df am: 437d2ad9af am: 90cc4f458d am: ee9dbb0cbe am: 55ac033524 am: 40013525e2 am: 0cdc713df5 am: be43019b46
am: 49464bb3d4 Change-Id: Ib9bcac7ae424ab84f0c97fc4e33750f52af970e7
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions