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