OSDN Git Service

Merge "Start using NetworkUtils.numericToInetAddress."
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 2 Mar 2011 20:10:51 +0000 (12:10 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Mar 2011 20:10:51 +0000 (12:10 -0800)
commit7e48e76cab10377367b925790cf3a840651009fa
tree74833222c8eeb9fd4c53711b61999d30761de74a
parent76bb1200c2ea08665f33fb0d54023113c19b8286
parente590373ea71251cfffc8f22f011e2e6335dce716
Merge "Start using NetworkUtils.numericToInetAddress."
core/java/android/server/BluetoothPanProfileHandler.java
services/java/com/android/server/ConnectivityService.java
services/java/com/android/server/connectivity/Tethering.java
wifi/java/android/net/wifi/WifiStateMachine.java