diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-09 19:11:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 19:11:34 +0000 |
| commit | b390fcdad513ae47cd3c801402846b2dd862b103 (patch) | |
| tree | 4e70eebc241ad3cb98ba164032d066b546e9da0e /annotations/generate_annotated_java_files.py | |
| parent | 0ebc2354db0614547522ee2ece5299def25b18b0 (diff) | |
| parent | 15ff3071031c18afbfada8df6c852f7747ccf16a (diff) | |
am 15ff3071: am 8b188b86: (-s ours) resolved conflicts for merge of 6c9609af to klp-modular-dev
* commit '15ff3071031c18afbfada8df6c852f7747ccf16a':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions