summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2016-06-22 19:47:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 19:47:39 +0000
commit40013525e2fb613a98166d504673e215c1083e13 (patch)
tree04f47010a6d2ef7cdc2e8eab6217ff782ffcfbb8 /include/ScopedJavaUnicodeString.h
parent5b8e67311384114d9a5c780522db4af0d6dc4d22 (diff)
parent55ac03352445f4c39f0e23310f00b095921ec8a6 (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 Change-Id: Ib9b26a5ad7576d583f8990cd0bfcd71d31c0ce26
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions