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/base/net_util.cc
|
b6cb656ba00bb19ac6723fcd2ad9e3c22fffa9f2 |
|
01-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in net_util.cc Include removed in CL: http://codereview.chromium.org/6394004 Change-Id: I8a0c21f69be740705b6dedaaaccb4615deb878c6
/external/chromium/net/base/net_util.cc
|
72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git. Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/net/base/net_util.cc
|
21d179b334e59e9a3bfcaed4c4430bef1bc5759d |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Initial merge by git. Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
/external/chromium/net/base/net_util.cc
|
4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
|
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git. Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
/external/chromium/net/base/net_util.cc
|
513209b27ff55e2841eac0e4120199c23acce758 |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git. Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
/external/chromium/net/base/net_util.cc
|
731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git. Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/net/base/net_util.cc
|
c77745f79a9f73c4e2d409f8ebc8b031fce6ca75 |
|
27-Oct-2010 |
Kristian Monsen <kristianm@google.com> |
Fixing ANDROID guards. All local changes should be properly guarded now. Change-Id: I913b673f3d8b1bdf5d84c0161a06950e5921636d
/external/chromium/net/base/net_util.cc
|
dd0e069b1c2e5079f99024c4d54c7d06ef81d11b |
|
13-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Fix networking code. Linux-specific code in dnsrr_resolver.cc doesn't compile on Android. http://src.chromium.org/viewvc/chrome?view=rev&revision=54907 NetLog added to HostResolver, fixing Android-specific code. http://src.chromium.org/viewvc/chrome?view=rev&revision=57189 Linux-specific IPv6 code in net_util.cc doesn't compile on Android. http://src.chromium.org/viewvc/chrome?view=rev&revision=41743 Not including SSL false start blacklist on Android to reduce bloat. http://src.chromium.org/viewvc/chrome?view=rev&revision=58824 ProxyConfigServiceNull is still used on unsupported platforms. This is a bug in Chromium. Reverting its deletion. http://src.chromium.org/viewvc/chrome?view=rev&revision=59362 Added virtual destructor to DNSSECPRovider in ssl_client_socket.h This has already been done for other Chrome classes, should be easy to upstream. Change-Id: I158fc709c295712dc35c4172708a294f65a381a4
/external/chromium/net/base/net_util.cc
|
3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/net/base/net_util.cc
|
49139a52abc21019da7fcbafdef393ad960ea0e2 |
|
01-Oct-2010 |
Patrick Scott <phanna@android.com> |
Build fixes for the simulator. Change-Id: I4c01c5383d311c7f06e91b1ded529ef6db156b3f
/external/chromium/net/base/net_util.cc
|
00d26a728db2814620f390b418a7d6325ce5aca6 |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Collection of all the changs to external chromium. Time is running out, I guess we have to submit this and remember to upstream. Rebased to chromium r53293 Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
/external/chromium/net/base/net_util.cc
|
c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293 Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/net/base/net_util.cc
|
c7f5f8508d98d5952d42ed7648c2a8f30a4da156 |
|
04-Feb-2010 |
Patrick Scott <phanna@android.com> |
Initial source checkin. The source files were determined by building net_unittests in chromium's source tree. Some of the obvious libraries were left out (v8, gmock, gtest). The Android.mk file has all the sources (minus unittests and tools) that were used during net_unittests compilation. Nothing builds yet because of STL but that is the next task. The .cpp files will most likely not compile anyways because of the LOCAL_CPP_EXTENSION mod. I will have to break this into multiple projects to get around that limitation.
/external/chromium/net/base/net_util.cc
|