Merge commit '7dbf57f6' into manualmerge

Conflicts:
	libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp

Change-Id: I7cf63f6a1ca7c7604301cb8bb947633ad704a2c0

diff --cc libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
index cb275b7,5191fdc..da91a99
--- 1/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
--- 2/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
+++ b/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
@@@ -2046,8 -2051,9 +2046,9 @@@ static void org_apache_harmony_xnet_pro
               * Everything else is a real error condition. We should
               * let the Java layer know about this by throwing an
               * exception.
 -             */ 
 +             */
-             throwIOExceptionWithSslErrors(env, ret, 0, "SSL shutdown failed.");
+             int sslErrorCode = SSL_get_error(ssl, ret);
+             throwIOExceptionWithSslErrors(env, ret, sslErrorCode, "SSL shutdown failed");
              break;
      }