am 07873e3a: am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCipherSuites."

* commit '07873e3a72da254bcdf965f6fa76bdcc800ef511':
  Fix SSLCertificateSocketFactory.getDefaultCipherSuites.
This commit is contained in:
Alex Klyubin
2013-10-29 08:56:18 -07:00
committed by Android Git Automerger

View File

@@ -533,7 +533,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
@Override
public String[] getDefaultCipherSuites() {
return getDelegate().getSupportedCipherSuites();
return getDelegate().getDefaultCipherSuites();
}
@Override