OSDN Git Service

am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
authorHui Lu <huilu@google.com>
Fri, 31 Jan 2014 08:11:57 +0000 (08:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 08:11:57 +0000 (08:11 +0000)
commit945d69d7b843ed319ec98986b033ea7b86383e69
tree435c0d8150fc08f71ad74bac7098c4d6f4d6f281
parentd0856259762eddd873a068c2e9cd3d4e45009a68
parent3cab7fc1b8f06166df3a58cf10d4a0db36bde788
am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev

* commit '3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
  Add proxy as another network.
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java