| c4807fda701ab2f97057a2967cf7b5eb766d5452 |
|
05-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
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
/external/chromium/net/http/http_stream_factory_impl_job.cc
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/net/http/http_stream_factory_impl_job.cc
|
| b200d761d3dffaafeac3254a421a24f78968f61c |
|
27-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Compile fixes in http_stream_factory_impl_job.cc
File used after merge, fixing compile problem with Android having an extra
parameter.
Change-Id: Icecb306e3aae35dca422c0372965249ea52ba2a5
/external/chromium/net/http/http_stream_factory_impl_job.cc
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/net/http/http_stream_factory_impl_job.cc
|