| commit | c4807fda701ab2f97057a2967cf7b5eb766d5452 | [log] [tgz] |
|---|---|---|
| author | Kristian Monsen <kristianm@google.com> | Tue Jul 05 17:41:37 2011 +0100 |
| committer | Kristian Monsen <kristianm@google.com> | Fri Jul 08 17:55:05 2011 +0100 |
| tree | 1c13ce82afe348b193617bb6c46e2a23366ac758 | |
| parent | 0efa6ab29775a30b185e842c74a1f0511252ef66 [diff] |
Merge Chromium at r12.0.742.93: Fix conflicts in http_stream_factory_impl_job.cc Not sure which CL caused the large diff, most relevant are: http://src.chromium.org/viewvc/chrome/branches/742/src/net/http/http_stream_factory_impl_job.cc?view=diff&pathrev=88489&r1=77907&r2=77908 http://src.chromium.org/viewvc/chrome/branches/742/src/net/http/http_stream_factory_impl_job.cc?view=diff&pathrev=88489&r1=79640&r2=79641 Our change was only a compile fix, so using the upstream version of the file. Change-Id: I74d8a437bb8764d0b95f2179e004a8253c1aa894