OSDN Git Service

resolved conflicts for merge of 914ed90f to honeycomb-LTE
authorIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)
committerIrfan Sheriff <isheriff@google.com>
Wed, 22 Jun 2011 18:01:16 +0000 (11:01 -0700)
commitcf99765b6255d73aa4fbc61d5bd78ec65fbd0370
treea8a3bb0cec1d2d22527902d3b3e283e1028bff83
parent5d5b73be515d839d72e1cf7aeffdfdfb56d66045
parent914ed90f2c02092474d2db36626734ca1b2cf315
resolved conflicts for merge of 914ed90f to honeycomb-LTE

Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
core/java/android/net/DhcpStateMachine.java
core/java/android/net/NetworkUtils.java
core/jni/android_net_NetUtils.cpp
wifi/java/android/net/wifi/WifiStateMachine.java