| commit | 967541840b77fc7cc33e96c7a02d57808ab94035 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Nov 03 14:36:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 14:36:33 2014 +0000 |
| tree | fd1a00aedd7bb1a00d54f46c3859bf6cff1799b7 | |
| parent | d321af258d7f56fdc711a4c9a21b919f2387d35d [diff] | |
| parent | f2c4b5bb1863ff1e001f36e3d263f28dc52f5a53 [diff] |
am f2c4b5bb: am fe15d2a0: am e702d545: Merge "Rewrite calls to Proxy.getPreferredHttpHost" * commit 'f2c4b5bb1863ff1e001f36e3d263f28dc52f5a53': Rewrite calls to Proxy.getPreferredHttpHost