tree b87a8e40ffb20302e013995f4b641e63c807f5e8
parent ee1a3df7cea2ed1b7d41b34d3a76b0e2e545d0ae
parent 80320a2b00e7ed8df9cf09f2af98c300895910ba
author Luca Milanesio <luca.milanesio@gmail.com> 1442485620 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1442485620 +0000

Merge "Move ProxySettings to an HTTP-related provider"