| commit | c9f5845a2a425e568812cb29d94652b5ee058394 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <[email protected]> | Fri Oct 10 09:57:39 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Fri Oct 10 09:57:39 2014 +0000 |
| tree | bb3cbe07ace1041dac4642e4524d85d3bb141b24 | |
| parent | cee54034353c4f03db9ee975a50be05c0496e1b2 [diff] | |
| parent | 75b7f959caa48362bbc4d6f3592e66d312380d1b [diff] |
am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp * commit '75b7f959caa48362bbc4d6f3592e66d312380d1b': Add support for TLS_FALLBACK_SCSV