| commit | eed5e7d102f897aaf8e98de2242f9aef2f7792c0 | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Sun Nov 02 19:03:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:03:24 2014 +0000 |
| tree | 39ada98599f546beb76a87b270396248c9f9ebba | |
| parent | 471262f90bcdedf1faa160b1b66fc1b862cc946d [diff] | |
| parent | 78f4dcb52be6818dd14fd148758895a3f5d3efad [diff] |
am 78f4dcb5: am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev * commit '78f4dcb52be6818dd14fd148758895a3f5d3efad': Add deprecated cipher suites to our SSLSocket