tree 08c77b20358321f4f2aed91aa7a23ed5ff0034fd
parent c65e463356e9c8b646e80d0bfb6cfc76a0a1b426
parent a9bebc221108dd679da0557963605cd704d05743
author Robert Greenwalt <rgreenwalt@google.com> 1365714704 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365714704 +0000

Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev