Commit Graph

3540 Commits

Author SHA1 Message Date
Chalard Jean
56dc1b34e4 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 am: f78faad32a am: a2fd68d0ba am: a9522fcc78 am: 1c57f17275 -s ours
am: 0da6b47eb4 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I6ca0a039c9660e265e88c280b9bf6a28a1e17e54
2019-08-26 13:51:08 -07:00
Xin Li
cc32380646 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 6139e416d3 -s ours am: 19c5d9ef15
am: 29cf52c2a4

Change-Id: I226843086f486b860429c8476dab102e33dff9b0
2019-08-26 11:27:03 -07:00
Chalard Jean
0da6b47eb4 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 am: f78faad32a am: a2fd68d0ba am: a9522fcc78
am: 1c57f17275 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Iec5362db1acc91535a44c285034a8ec8fc378f8b
2019-08-24 05:17:53 -07:00
Chalard Jean
1c57f17275 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 am: f78faad32a am: a2fd68d0ba
am: a9522fcc78

Change-Id: I431242cb5a46d513bce4d820d727ebfe33907624
2019-08-24 05:12:47 -07:00
Chalard Jean
a9522fcc78 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585 am: f78faad32a
am: a2fd68d0ba

Change-Id: I299863f5ab88c2ca61da8e8d092210711ccdb0ce
2019-08-24 02:42:37 -07:00
Chalard Jean
a2fd68d0ba [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08 am: de905bf585
am: f78faad32a

Change-Id: I7b88ca5465d73500d5c8691c92ec53902ff58a0e
2019-08-24 02:23:25 -07:00
Chalard Jean
f78faad32a [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71 am: 6e8980ff08
am: de905bf585

Change-Id: Ibdf13f701662456f6b03ca379bf8c5f325b064b2
2019-08-24 01:59:06 -07:00
Chalard Jean
de905bf585 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71
am: 6e8980ff08

Change-Id: Ie516684e359060f4d3108e8acce4e1a5314959c5
2019-08-24 01:16:51 -07:00
Xin Li
29cf52c2a4 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 6139e416d3 -s ours
am: 19c5d9ef15

Change-Id: I08d07f2510f5388f1e8616621e7e60a90c621786
2019-08-23 21:18:31 -07:00
Android Build Merger (Role)
6e8980ff08 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff am: 8f5db6ef71
Change-Id: I28a1f16516d3d3936d49dd7dfaa4438eef0e217a
2019-08-24 03:32:20 +00:00
Android Build Merger (Role)
8f5db6ef71 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189 am: 080280ebff
Change-Id: Ieba241f8b9fdf26368f0648fc091c3a648fd0892
2019-08-24 03:32:17 +00:00
Android Build Merger (Role)
080280ebff [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189
Change-Id: I2c21749f6f896e382f7afdf913ab8a84f6723c2b
2019-08-24 03:32:12 +00:00
Android Build Merger (Role)
d086c29189 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b
Change-Id: I7ed1d70db711cd33aa0e806d7d5f9946ca2e951c
2019-08-24 03:32:08 +00:00
Android Build Merger (Role)
aa92791e8b [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324
Change-Id: I7f41806ea7bb0148d181e848d55e53f264596ec5
2019-08-24 03:32:05 +00:00
Chalard Jean
ddfb743324 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
am: af4499cf45

Change-Id: I4036de2d4a1ccd190c559b95470fdab09cb948c0
2019-08-23 20:31:47 -07:00
Xin Li
19c5d9ef15 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
am: 6139e416d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I902b1be081ec2efc3431bc5f8f89c9f7c79cc497
2019-08-23 20:25:32 -07:00
Treehugger Robot
af4499cf45 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev 2019-08-23 18:10:09 +00:00
Xin Li
6139e416d3 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Bug: 139893257
Change-Id: Ie7606689aeb65115246c98b28a8430f1522b4437
2019-08-23 15:37:52 +00:00
Chalard Jean
2bf54f7c79 Attempt "fix" the broken QUIC packet to be slightly less broken
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com>
Merged-In: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
Test: in I9c938998b5e30f7d3994b410878b2af6a75f9b5a
(cherry picked from commit 8ce68f1310)

Change-Id: If544089eb79801cad7660f3f419fa304387fc402
2019-08-23 09:49:42 +00:00
Maciej Zenczykowski
2790068de3 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd am: 70c8696751
am: 7fd3cd60f4

Change-Id: I90e86af40ec44d2636ff3388489d8053e95fb7c4
2019-08-21 18:37:25 -07:00
Android Build Merger (Role)
4cea068def Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd am: b559b8cd82 am: 2e275c80fe" into qt-qpr1-dev-plus-aosp 2019-08-22 01:33:07 +00:00
Maciej Zenczykowski
dca99dba2a Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd am: b559b8cd82
am: 2e275c80fe

Change-Id: I72285e294d4ffcb64de9e9f3ad5a1cf032e3fd31
2019-08-21 18:32:46 -07:00
Maciej Zenczykowski
363229fee1 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd am: b559b8cd82
am: 9844d92607

Change-Id: I37421c0ad81efa363365466d60b4d4478270c269
2019-08-21 18:31:52 -07:00
Maciej Zenczykowski
7fd3cd60f4 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd
am: 70c8696751

Change-Id: Id319b325bba2a55035770a672efd6cdf43a7c12b
2019-08-21 18:23:11 -07:00
Maciej Zenczykowski
2e275c80fe Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd
am: b559b8cd82

Change-Id: If2308d2b8caf1d1e4afbdfcf3d4e92079252b61f
2019-08-21 18:21:45 -07:00
Maciej Zenczykowski
70c8696751 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
am: 86301dddcd

Change-Id: If8d3ffa40d5d56a6057fdf53432127d88fd39f64
2019-08-21 18:09:05 -07:00
Maciej Zenczykowski
b559b8cd82 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
am: 86301dddcd

Change-Id: Ie40c609af50bb2718f8a7771201fcd6d9e28be25
2019-08-21 18:09:03 -07:00
Erik Kline
6ee1049428 Attempt "fix" the broken QUIC packet to be slightly less broken
Bug: 139403355
Merged-In: I372c0730c9bd5329761b5a74b38e0f743bfd8230
(cherry picked from commit d6af2b5225249b178ee69dc5bac9b40c46f08d76)

Change-Id: I2955a3f9e733a5e39813a26e4cd630f79ae144a0
2019-08-21 18:37:03 +00:00
Chalard Jean
c76ebf6ca0 Merge "[automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 am: b778ab29c0 -s ours
am: 41e66df99c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I18b04110d3cf5da849aa39c7841f057b586a3cfe
2019-08-21 02:19:30 -07:00
Android Build Merger (Role)
aca9c19f88 Merge "[automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 am: b778ab29c0 am: 94726b7a16 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" into qt-qpr1-dev-plus-aosp 2019-08-21 09:18:03 +00:00
Chalard Jean
85c7fe893d [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 -s ours am: 60cceda538 -s ours
am: 9d220a299b -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I9b31249cba855d03825b4f55e3d0dffcee487ea7
2019-08-21 02:17:35 -07:00
Chalard Jean
3d0eeb7209 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 am: b778ab29c0
am: 94726b7a16 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ibda7bb68c073d0152554b1be3e282d90645e674b
2019-08-21 02:17:35 -07:00
Android Build Merger (Role)
41e66df99c Merge "[automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 am: b778ab29c0 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" into qt-r1-dev-plus-aosp 2019-08-21 09:12:01 +00:00
Chalard Jean
5017ead2f7 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833
am: b778ab29c0 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ie7749c58f75cceb40221770513b1fe2af7142cb4
2019-08-21 02:11:34 -07:00
Chalard Jean
9d220a299b [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 -s ours
am: 60cceda538 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I6a5f4b0ac2a193902e8adfe397dd9a5c80eff3e9
2019-08-21 02:11:32 -07:00
Chalard Jean
60cceda538 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours
am: e2cf372833 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I3a97316bcfa6c32418910cb00c22ab91ff4a3c22
2019-08-21 02:05:27 -07:00
Chalard Jean
b778ab29c0 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours
am: e2cf372833

Change-Id: I7481fccb313d14d761b74cc96a10fb0d87b82af9
2019-08-21 02:05:22 -07:00
Chalard Jean
e2cf372833 [automerger skipped] [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c am: 59e3425113
am: acc1c3ab97 -s ours
am skip reason: SHA1 acc1c3ab97 skipped by user jchalard

Change-Id: I875c775b9144b02bb06cc69d1702f7e62170879b
2019-08-21 01:59:29 -07:00
Chalard Jean
acc1c3ab97 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793 am: 6c135ac35c
am: 59e3425113

Change-Id: I678f59522233aa41f55143cb6508b691c209b048
2019-08-21 01:34:42 -07:00
Chalard Jean
59e3425113 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c am: 55b8c84793
am: 6c135ac35c

Change-Id: I3716bbe0bc6c575cb00bdec42540e11d89fb1d4f
2019-08-21 01:28:22 -07:00
Chalard Jean
6c135ac35c [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c
am: 55b8c84793

Change-Id: I61524d628dea28a95af19cb359c9bca6822eaa3f
2019-08-21 01:21:47 -07:00
Android Build Merger (Role)
55b8c84793 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669 am: c55b04351c
Change-Id: I1e40b4240b8639860c5db001a251f28a436037c4
2019-08-21 08:10:57 +00:00
Android Build Merger (Role)
c55b04351c [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a am: f611b30669
Change-Id: I1b7d83a42bd6b8ae28daae974d8d751d11dbec20
2019-08-21 08:10:50 +00:00
Android Build Merger (Role)
f611b30669 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a
Change-Id: I13d8da83b93f444310e647f11d4e6801557a892b
2019-08-21 08:10:44 +00:00
Android Build Merger (Role)
446311265a [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7
Change-Id: I997dd232a40e070079c446da9003f6035c53355e
2019-08-21 08:10:38 +00:00
Android Build Merger (Role)
d6ae111ff7 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74
Change-Id: I1e15a9124ea6251fe44401f194416cbf5707d523
2019-08-21 08:10:34 +00:00
Android Build Merger (Role)
9c8f9cef74 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2
Change-Id: I4a5a31dfb9e894afc352b082e344b17b4e3209c2
2019-08-21 08:10:29 +00:00
Android Build Merger (Role)
c2a5ccb153 [automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93
Change-Id: Ica6b9699d7c429d6f0d4088fb0a05b4ecf49e818
2019-08-21 08:10:20 +00:00
Chalard Jean
7e685d9f80 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev
am: e9da15c22e

Change-Id: I4a659f2c16358a59a1ab981e74e0b6592fbb0a76
2019-08-21 01:09:45 -07:00
Treehugger Robot
e9da15c22e Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev 2019-08-21 07:53:28 +00:00