summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2016-06-22 19:55:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 19:55:02 +0000
commit49464bb3d4513fb65fe8966dd296b41bd29331e9 (patch)
treed7d4bd3f3d1a4a8a18a1f4887cf4432c5b31f8bc /annotations/generate_annotated_java_files.py
parentc6d293d5b2a44e416556c2df82ba9c30eb270391 (diff)
parentbe43019b461e7ff61f5c2fc7ed17c936ddf7f7ac (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 Change-Id: I51345a6a030b2760cbc9b6b5fbd64195e8e38d06
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions