OSDN Git Service

Manual merge of eclair change I26548922 into master.
authorLorenzo Colitti <lorenzo@google.com>
Sat, 19 Sep 2009 18:06:31 +0000 (11:06 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Sat, 19 Sep 2009 18:06:31 +0000 (11:06 -0700)
commitc18a33fd3b05e720cd6b6e3215c99546f17985e6
tree57d94080dbd75293938174770af740126e025582
parent87f9189e9da0e4a441c55df02c9028d4002ae3d4
Manual merge of eclair change I26548922 into 
libcore/luni/src/main/java/java/net/Inet4Address.java
libcore/luni/src/main/java/java/net/Inet6Address.java
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