Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I565a757a5f9b37f075d53a446c915506ceef0074
am 617450fe: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability

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

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72
Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259

(cherry-picked from 617450fed233b4b17a8a7c7b9f60ecabc513df21)

Change-Id: I14c83f51da98c9340ec0c8429d16ae5c06a0d2c1
Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability"
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
Reconcile with jb-mr0-release - do not merge

Change-Id: I210109f82080d0a7b783f7f10a6ca1cc30460405
am 0c19ef3d: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '0c19ef3df1e47accc7534a1d40e55b7df8725441':
Get rid of LOCAL_MODULE_TAGS := user

Change-Id: I9d010fc5ade312a74a7c8db8920dd40e259bf0a4
Merge "Get rid of LOCAL_MODULE_TAGS := user"
am 6c86b774: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '6c86b77423a33e8b06c4dd4337cdc13696513b1d':
  Get rid of LOCAL_MODULE_TAGS := user
am 20e9350e: am 6c86b774: Merge "Get rid of LOCAL_MODULE_TAGS := user"

* commit '20e9350e5fd358cd58db82c9157e9b23562ac097':
  Get rid of LOCAL_MODULE_TAGS := user
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/wpa_supplicant_6 into mr1-staging
merge remote tracking branch 'cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>