| commit | f2c4b5bb1863ff1e001f36e3d263f28dc52f5a53 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Nov 03 14:32:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:32:56 2014 +0000 |
| tree | 135dcb6bf265ad1afb14ee85915187d62d52f701 | |
| parent | bebff0d11c5a670cb24cd85e3fdbda5f4aac1739 [diff] | |
| parent | fe15d2a0bf7b10a21a53a4e286f6bad5ccbce7d3 [diff] |
am fe15d2a0: am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost" * commit 'fe15d2a0bf7b10a21a53a4e286f6bad5ccbce7d3': Rewrite calls to Proxy.getPreferredHttpHost