| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ndroid/java/src/org/chromium/net/ChromiumUrlRequest.java
ndroid/java/src/org/chromium/net/ChromiumUrlRequestContext.java
ndroid/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
ndroid/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java
ndroid/java/src/org/chromium/net/HttpUrlRequestFactory.java
ndroid/java/src/org/chromium/net/HttpUrlRequestFactoryConfig.java
ndroid/java/src/org/chromium/net/UrlRequestContext.java
ndroid/java/src/org/chromium/net/UrlRequestContextConfig.template
ndroid/org_chromium_net_UrlRequestContext.cc
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
ndroid/url_request_context_peer.cc
ndroid/url_request_context_peer.h
rl_request_context_config.cc
rl_request_context_config.h
rl_request_context_config_list.h
|
| cedac228d2dd51db4b79ea1e72c7f249408ee061 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ndroid/cronet_jni.cc
ndroid/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlRequestListener.java
ndroid/java/src/org/chromium/net/UrlRequest.java
ndroid/org_chromium_net_UrlRequest.cc
ndroid/url_request_context_peer.cc
ndroid/url_request_peer.cc
ndroid/url_request_peer.h
ools/cronet_licenses.py
ools/extract_from_jars.py
|
| 010d83a9304c5a91596085d917d248abff47903a |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ndroid/cronet_jni.cc
ndroid/org_chromium_net_UrlRequest.cc
ndroid/org_chromium_net_UrlRequestContext.cc
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ndroid/cronet_jni.cc
ndroid/java/src/org/chromium/net/ChromiumUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlRequestListener.java
ndroid/java/src/org/chromium/net/LibraryLoader.java
ndroid/org_chromium_net_UrlRequestContext.cc
ndroid/org_chromium_net_UrlRequestContext.h
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ndroid/sample/src/org/chromium/cronet_sample_apk/LibraryLoader.java
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ndroid/java/src/org/chromium/net/UrlRequest.java
ndroid/java/src/org/chromium/net/UrlRequestContext.java
ndroid/org_chromium_net_UrlRequest.cc
ndroid/org_chromium_net_UrlRequest.h
ndroid/org_chromium_net_UrlRequestContext.cc
ndroid/url_request_context_peer.cc
ndroid/url_request_context_peer.h
ndroid/url_request_peer.cc
ndroid/url_request_peer.h
|
| c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
EPS
WNERS
ndroid/DEPS
ndroid/java/src/org/chromium/net/ChromiumUrlRequest.java
ndroid/java/src/org/chromium/net/ChromiumUrlRequestContext.java
ndroid/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
ndroid/java/src/org/chromium/net/ChunkedWritableByteChannel.java
ndroid/java/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java
ndroid/java/src/org/chromium/net/HttpUrlRequest.java
ndroid/java/src/org/chromium/net/HttpUrlRequestFactory.java
ndroid/java/src/org/chromium/net/HttpUrlRequestListener.java
ndroid/java/src/org/chromium/net/ResponseTooLargeException.java
ndroid/java/src/org/chromium/net/UrlRequest.java
ndroid/java/src/org/chromium/net/UrlRequestContext.java
ndroid/java/src/org/chromium/net/UrlRequestError.template
ndroid/java/src/org/chromium/net/UrlRequestPriority.template
ndroid/java/src/org/chromium/net/UsedByReflection.java
ndroid/java/src/org/chromium/net/UserAgent.java
ndroid/org_chromium_net_UrlRequest.cc
ndroid/org_chromium_net_UrlRequest.h
ndroid/org_chromium_net_UrlRequestContext.cc
ndroid/org_chromium_net_UrlRequest_error_list.h
ndroid/org_chromium_net_UrlRequest_priority_list.h
ndroid/sample/AndroidManifest.xml
ndroid/sample/javatests/AndroidManifest.xml
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/ChunkedWritableByteChannelTest.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/CriteriaHelper.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSamplePreconditionsTest.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTestBase.java
ndroid/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ndroid/sample/res/layout/cronet_sample_activity.xml
ndroid/sample/res/values/strings.xml
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ndroid/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
ndroid/sample/src/org/chromium/cronet_sample_apk/LibraryLoader.java
ndroid/url_request_context_peer.cc
ndroid/url_request_context_peer.h
ndroid/url_request_peer.cc
ndroid/url_request_peer.h
|