tree ecc3e2d0015a86a51d787044defb13b885d21965
parent 2c84469ef0c504474e81ea711283c4044ff7e1d7
parent e3bf5a169f6a766bbde14ea0176c4bc284af4c2a
author Brian Carlstrom <bdc@google.com> 1343344993 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343344993 -0700

am e3bf5a16: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability"

* commit 'e3bf5a169f6a766bbde14ea0176c4bc284af4c2a':
  Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability