diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-10 09:33:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 09:33:02 +0000 |
| commit | bb3214f878cf048dc21b768dac7b0a02ab063033 (patch) | |
| tree | bcaa7d72e7f6ad517f894793a75abb4486cac2d8 /annotations/generate_annotated_java_files.py | |
| parent | 6c9609af5f63a759bd50b5f6586f6f52502b4f93 (diff) | |
| parent | 2164d895f9ae077ce2d53ccdcc213c3483f3b9bd (diff) | |
am 2164d895: (-s ours) resolved conflicts for merge of 865c83f8 to jb-mr2-dev-plus-aosp
* commit '2164d895f9ae077ce2d53ccdcc213c3483f3b9bd':
Add support for TLS_FALLBACK_SCSV
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions