Commit Graph

3290 Commits

Author SHA1 Message Date
Chalard Jean
56909ca698 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 am: 6688a3468c am: e371d736d4 am: 0ce247cdd8
am: e5c4971286

Change-Id: I3af293a72c9361a756e3568e9d8457c8574cebfc
2019-08-27 15:33:05 -07:00
markchien
b0c9d6f327 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours
am: 4f12dd079b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ic565bd5584a07a8a7f3b23c20d47210f9afa7df1
2019-08-27 15:27:57 -07:00
Chalard Jean
e5c4971286 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 am: 6688a3468c am: e371d736d4
am: 0ce247cdd8

Change-Id: Iaf464ed9b71919afe1f979de60009f628963d093
2019-08-27 15:17:31 -07:00
markchien
4f12dd079b 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours
am: d2a3794666 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I9650cc3a37ba2f78d2dd5cf8923c8407f2f4a073
2019-08-27 15:14:55 -07:00
Chalard Jean
0ce247cdd8 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 am: 6688a3468c
am: e371d736d4

Change-Id: I877fafa84afcb547572a081210a8fecd2e0ed186
2019-08-27 14:43:14 -07:00
markchien
d2a3794666 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: 17100fbdaa -s ours
am: b5c8af70e8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ib42a9821da07d1c9ea48567ae37226ff9d329c30
2019-08-27 14:41:21 -07:00
Chen Zhu
be3a471e33 Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev 2019-08-27 04:38:13 +00:00
Chalard Jean
ad81a4ee9a Merge "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" into pie-cts-dev am: 3a915f2921
am: f6fe877aff

Change-Id: Ia0277b972124e03db9424741e995261067f75de3
2019-08-26 16:58:47 -07:00
markchien
6705fff979 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: c347654003 -s ours
am: 2720cfb7ad -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: If7724529b04189ff8271835457de48694bd8b780
2019-08-26 16:56:45 -07:00
Chalard Jean
f6fe877aff Merge "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" into pie-cts-dev
am: 3a915f2921

Change-Id: Ia0f074c72325415ca7ebfa34d17b3affe6d625ac
2019-08-26 16:02:40 -07:00
markchien
2720cfb7ad 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: c347654003 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I6cde06e3ea6337c00bca28792d0bedc94a529e35
2019-08-26 16:00:14 -07:00
markchien
48516f991b Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours
am: 6df286c92f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Iae471ae678565978889a770433f769e5c8ae1292
2019-08-26 14:55:41 -07:00
markchien
6df286c92f Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours
am: ddb681cafe -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3f3279a8747253ac763d0703075485c3153cda86
2019-08-26 14:25:09 -07:00
Android Merger
3a915f2921 Merge "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" into pie-cts-dev 2019-08-26 21:18:31 +00:00
Chalard Jean
cc2444de25 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: I522eb865c0fad10c40a2152d1189a8f6c454de80
2019-08-26 14:18:20 -07:00
Android Merger
c347654003 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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev 2019-08-26 21:17:50 +00:00
markchien
b3c63b6961 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 52b82e3312 is in history

Change-Id: I4b51a0ab8f2f19bcc4e42101be0c50616b3e2b9e
2019-08-26 14:17:38 -07:00
Android Merger
ddb681cafe Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev 2019-08-26 21:05:29 +00:00
markchien
8367edd304 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours
am: 956b28af13 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Idbd771af2cae19681ae9775c162906d8aaf2569c
2019-08-26 14:05:15 -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
e371d736d4 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
am: 6688a3468c

Change-Id: I10f2ea412a2563f52654d0633f71151913c79fbf
2019-08-26 12:42:54 -07:00
markchien
b5c8af70e8 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: 17100fbdaa -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I595f51bfba8a379a2a9afff77292ad361a65d480
2019-08-26 12:40:46 -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
Chalard Jean
6688a3468c 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: I8e5b8c75031102cdd14605d336028ab3dbfa7e9c
2019-08-26 12:16:02 -07:00
markchien
17100fbdaa 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 dd32bb52f7 is in history

Change-Id: I6d31b4d1c94057cf0ad1904374841a71e2042f24
2019-08-26 12:13:59 -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
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
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