summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2016-06-22 19:52:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 19:52:31 +0000
commitbe43019b461e7ff61f5c2fc7ed17c936ddf7f7ac (patch)
treed7d4bd3f3d1a4a8a18a1f4887cf4432c5b31f8bc /include/ScopedJavaUnicodeString.h
parentaf27f8765d07702b932b052627bd033865ff128f (diff)
parent0cdc713df5c01b0c0f0d4516e12781a2197ad460 (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 Change-Id: I2ce31fb77ff2c447ab0b88ac922dc51ebb0c4a92
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions