OSDN Git Service

Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
authorPaul Jensen <pauljensen@google.com>
Thu, 11 Dec 2014 04:51:14 +0000 (04:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Dec 2014 04:51:16 +0000 (04:51 +0000)
commit2122e14cca3edc5099b90d8768b34d7a0e9fe148
tree7ecb3cbfe25728bc339ac2237809ad5f74dd2dd5
parentfda0ff020d2ce63e4010e24d5f4bebf7fbe026c5
parente0bef71662d81caaaa0d7214fb0bef5d39996a69
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
core/java/android/net/ConnectivityManager.java
services/core/java/com/android/server/ConnectivityService.java