OSDN Git Service

Manual merge of change I3665f82b into master.
authorLorenzo Colitti <lorenzo@google.com>
Fri, 18 Sep 2009 22:25:06 +0000 (15:25 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Tue, 29 Sep 2009 22:29:36 +0000 (15:29 -0700)
commit1b4ca183763171fdd5228d6184ad77a61046bbea
tree2e6e15e3efdbd9021b449ab9a635a36d829bff8d
parent0e834848b2df0fb6a3f72b76be256f7f4e987827
Manual merge of change I3665f82b into master.
libcore/luni/src/main/java/java/net/InetAddress.java
libcore/luni/src/main/java/org/apache/harmony/luni/platform/INetworkSystem.java
libcore/luni/src/main/java/org/apache/harmony/luni/platform/OSNetworkSystem.java
libcore/luni/src/main/java/org/apache/harmony/luni/util/Inet6Util.java
libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java
libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java
libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java