Chalard Jean
7cc02090d1
[automerger skipped] Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7 am: 175714a227 am: 5a5fea23f9 am: 7c64b55ee7 -s ours am: c59a2d1f73 -s ours
...
am: 57a5075fd0 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: Ide86369870461b89110822e4f43b51b7af05743a
2019-08-26 15:55:26 -07:00
markchien
5f9d7cd017
Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours am: ec58302ece -s ours am: 6c5b96fc25 -s ours
...
am: 2f820c483e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history
Change-Id: Ie7f1a2fddff84196f35cfaea63301e0d3cdc6740
2019-08-26 15:53:04 -07:00
Chalard Jean
57a5075fd0
[automerger skipped] Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7 am: 175714a227 am: 5a5fea23f9 am: 7c64b55ee7 -s ours
...
am: c59a2d1f73 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I4f664a48006c77b6b394f70e30c59adc285e5b2a
2019-08-26 14:13:35 -07:00
markchien
d6440dffc9
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours am: ec58302ece -s ours
...
am: 6c5b96fc25 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history
Change-Id: I8f4d2874094740e8deeac2143f0b22c80ddeb143
2019-08-26 14:11:44 -07:00
Chalard Jean
d19f1e58e1
[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 -s ours am: de6840b292 -s ours
...
am: 3a3e17ec6c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I3c268db641467f5c3f5477f3f7d62169fe52dd0c
2019-08-26 13:58:43 -07:00
Chalard Jean
c59a2d1f73
[automerger skipped] Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7 am: 175714a227 am: 5a5fea23f9
...
am: 7c64b55ee7 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I5b3d1108ca5bfe3a7d010bac975f5024a62c95ca
2019-08-26 13:52:20 -07:00
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
markchien
6c5b96fc25
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours am: 5be8f14258 -s ours
...
am: ec58302ece -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history
Change-Id: I68ad5fda9cfffba64ae994a5271db424dfe1fc48
2019-08-26 13:49:56 -07:00
Chalard Jean
7c64b55ee7
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7 am: 175714a227
...
am: 5a5fea23f9
Change-Id: Ia0ab6593b848edfdb01cfe059d8bd0eed29a3e7a
2019-08-26 13:33:56 -07:00
markchien
ec58302ece
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: 8a4065394b -s ours
...
am: 5be8f14258 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history
Change-Id: I40a141c7e295fea0245f77739d756818d9970d3a
2019-08-26 13:32:01 -07:00
Chalard Jean
5a5fea23f9
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7
...
am: 175714a227
Change-Id: I366780b4adb2c1ab6131f4d492959a812605e569
2019-08-26 12:57:52 -07:00
markchien
5be8f14258
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours
...
am: 8a4065394b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history
Change-Id: If9025a516481d56021235bf579c30ca2b979d379
2019-08-26 12:55:38 -07:00
Chalard Jean
175714a227
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev
...
am: acfa8b7bb7
Change-Id: I5dc795c29406065c7e96c881e7608bb53e4b8e15
2019-08-26 12:37:19 -07:00
markchien
8a4065394b
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours
...
am: 4f182df10a -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history
Change-Id: I947f0790eb6b8c71d0efdaf73592567636c368c2
2019-08-26 12:32:53 -07:00
Android Merger
acfa8b7bb7
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev
2019-08-26 19:08:35 +00:00
Chalard Jean
d5c8e158bc
Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev
...
am: 6bc025004b
Change-Id: I2b3537970fd494794b441340b84ed7ef4c564c06
2019-08-26 12:08:22 -07:00
Android Merger
4f182df10a
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-mr1-cts-dev
2019-08-26 19:07:43 +00:00
markchien
c7e558b100
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours
...
am: 335491989f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I99b533a6db29b6568b487cda80ba2f7fd5a1a6ac
2019-08-26 12:07:31 -07:00
Android Merger
6bc025004b
Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev
2019-08-26 18:56:14 +00:00
Chalard Jean
b50dd23f95
Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev
...
am: 28dbc1ff07
Change-Id: Ia10e54a5e4afe88df0a4f0f18136ad67021f48cb
2019-08-26 11:56:05 -07:00
Android Merger
335491989f
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-cts-dev
2019-08-26 18:55:30 +00:00
markchien
0619ed30a2
[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
...
am: 63dda3513d -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I9b3f5d162a2bf1b5e576af496f6b4428b3aaa0f4
2019-08-26 11:55:21 -07:00
Android Merger
28dbc1ff07
Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev
2019-08-26 18:38:33 +00:00
Chalard Jean
dbafd34852
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
...
am: af4499cf45
Change-Id: Id99d972fa4d54a1f73ca11d9d1a8482fc35c9ea7
2019-08-26 11:38:25 -07:00
Android Merger
63dda3513d
Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
2019-08-26 18:37:58 +00:00
markchien
0d6a32a571
Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
...
am: 873f2d8aa3
Change-Id: Ib9749b290a9cc943f441457b22f660cbe2b85b3b
2019-08-26 11:37:49 -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
3a3e17ec6c
[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 -s ours
...
am: de6840b292 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I4d343529997f0aa3514a3c0264f2956523a32c2b
2019-08-24 05:30:53 -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
de6840b292
[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 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I5d031682e9b99ce9d235eb7f97d4c620ed8d13dd
2019-08-24 05:10:51 -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