Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d39e91 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 005f0d08: am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread

Merge commit '005f0d08'

* commit '005f0d08':
  Tracking merge of dalvik-dev to gingerbread
parents cc5239b7 005f0d08
Loading
Loading
Loading
Loading
+15 −2
Original line number Diff line number Diff line
@@ -258066,7 +258066,7 @@
<method name="copySign"
 return="double"
 abstract="false"
 native="true"
 native="false"
 synchronized="false"
 static="true"
 final="false"
@@ -258081,7 +258081,7 @@
<method name="copySign"
 return="float"
 abstract="false"
 native="true"
 native="false"
 synchronized="false"
 static="true"
 final="false"
@@ -276517,6 +276517,19 @@
<parameter name="p" type="java.security.Permission">
</parameter>
</method>
<method name="isValidIP6Address"
 return="boolean"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="ipAddress" type="java.lang.String">
</parameter>
</method>
</class>
<class name="SocketTimeoutException"
 extends="java.io.InterruptedIOException"
+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import java.io.Reader;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
import javax.net.ssl.TestSSLContext;
import junit.framework.TestCase;
import libcore.javax.net.ssl.TestSSLContext;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;