| commit | 080035f3d1ae8b18efe93254b392e309fbb42b31 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <[email protected]> | Fri Oct 10 14:35:26 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Fri Oct 10 14:35:26 2014 +0000 |
| tree | 441ca9a473b409bfe1c89324c0c08129160b0542 | |
| parent | 393dad2200477ac5f3f0cb7d4be5de80aa5d6548 [diff] | |
| parent | c9f5845a2a425e568812cb29d94652b5ee058394 [diff] |
am c9f5845a: am 75b7f959: am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp * commit 'c9f5845a2a425e568812cb29d94652b5ee058394': Add support for TLS_FALLBACK_SCSV