| commit | 273703935d185b82e5d5e8a0ae2363743558227f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Apr 09 11:19:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 11:19:34 2013 -0700 |
| tree | 2cf4ee94302d8a5c336ac2b9bba8aec95162f1c0 | |
| parent | 92bc5d5c7da286553d606679058e23858dbb4b94 [diff] | |
| parent | dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf [diff] |
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev * commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf': Turn back on global proxy support.