diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 09:53:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 09:53:37 +0000 |
| commit | 39d896a3dad05a8101b10a675e6e056c717e36c3 (patch) | |
| tree | 4e70eebc241ad3cb98ba164032d066b546e9da0e /annotations/generate_annotated_java_files.py | |
| parent | 15ff3071031c18afbfada8df6c852f7747ccf16a (diff) | |
| parent | 73041ff9f871029aa0fa2aae75f3567c6ff96942 (diff) | |
am 73041ff9: am bb3214f8: am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp
* commit '73041ff9f871029aa0fa2aae75f3567c6ff96942':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions