| commit | 74a2a5dae0b014adcc75859ede854761dfefd499 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Apr 09 14:25:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 09 14:25:20 2013 -0700 |
| tree | 949408a6a6e28ad2c7a7915e9cd095ced914f84c | |
| parent | 3aa5aaa4eeafe50463af4ccedef07d0a54b917b1 [diff] | |
| parent | 273703935d185b82e5d5e8a0ae2363743558227f [diff] |
am 27370393: am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev * commit '273703935d185b82e5d5e8a0ae2363743558227f': Turn back on global proxy support.