| commit | 215018f6e228700306e7df6422e7e316a916110e | [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 | 9e7b0db9a473a08073f75efae2489ebd9217658a | |
| parent | ebff3ebaba0e7fda0b587c309d497f9fd1f3b157 [diff] | |
| parent | da77cb16c81f91bb07756ccd58d20fecee069a37 [diff] |
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev * commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf': Turn back on global proxy support.