| commit | 78f4dcb52be6818dd14fd148758895a3f5d3efad | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Sun Nov 02 18:53:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 18:53:42 2014 +0000 |
| tree | 0bb085e8ecc2979d2754aad734e12d57b3964b03 | |
| parent | 4018b9cc9ef0b75310c0c3fdba4dd8b24fbae6fe [diff] | |
| parent | 04b776268b067b4fb56ee9f3f3fedfe465f5eac3 [diff] |
am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev * commit '04b776268b067b4fb56ee9f3f3fedfe465f5eac3': Add deprecated cipher suites to our SSLSocket