| commit | 75b7f959caa48362bbc4d6f3592e66d312380d1b | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 10 09:51:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 10 09:51:39 2014 +0000 |
| tree | a48b48781873dc248e266fd1d6a7d49518a970f9 | |
| parent | aad21bb5750deae5bdff03023a5b0fce64596253 [diff] | |
| parent | 2b5a3d1f368ebada581192f8aca1a48335987620 [diff] |
am 2b5a3d1f: am 0f2dac0f: resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp * commit '2b5a3d1f368ebada581192f8aca1a48335987620': Add support for TLS_FALLBACK_SCSV