OSDN Git Service

am d5273da9: Merge "Allow more proxy bypass patterns"
authorYuhao Zheng <yuhaozheng@google.com>
Tue, 4 Mar 2014 17:45:50 +0000 (09:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Mar 2014 17:45:50 +0000 (09:45 -0800)
commit5fd51324e5e57c24644f45bdc01f16cab8b18e8a
tree40e8eb54ea239d5063ca8ef0b85333ac78de6892
parent805b0b6b4cd5612cd2f76129679520f15873dc54
parentd5273da95b333b018c0d13bd6917a1e8a769f064
am d5273da9: Merge "Allow more proxy bypass patterns"

* commit 'd5273da95b333b018c0d13bd6917a1e8a769f064':
  Allow more proxy bypass patterns