tree 9e7b0db9a473a08073f75efae2489ebd9217658a
parent ebff3ebaba0e7fda0b587c309d497f9fd1f3b157
parent da77cb16c81f91bb07756ccd58d20fecee069a37
author Robert Greenwalt <rgreenwalt@google.com> 1365531574 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365531574 -0700

am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev

* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.