OSDN Git Service

Merge "Allow more proxy bypass patterns"
authorYuhao Zheng <yuhaozheng@google.com>
Tue, 4 Mar 2014 17:43:48 +0000 (17:43 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Mar 2014 17:44:04 +0000 (17:44 +0000)
commitd5273da95b333b018c0d13bd6917a1e8a769f064
treef0663072ae99a73cb73cee815a9cf55bc88f55d0
parent5c43d4e451a1480d82014a1e1c403a5c764e758c
parent3dce5af6abc9c8d41d24d9499410b33ec76b1f08
Merge "Allow more proxy bypass patterns"
core/java/android/net/Proxy.java