markchien
dd9de69fa9
[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: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours
...
am: 02ec1bfb0cdd32bb52f7
2019-08-27 16:05:39 -07:00
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
2019-08-27 15:33:05 -07:00
markchien
02ec1bfb0c
[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: 98a30a1eec -s ours am: e693a1fd0f -s ours
...
am: f37b8ca988dd32bb52f7
2019-08-27 15:31:04 -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: 4f12dd079bdd32bb52f7
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
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: d2a3794666dd32bb52f7
2019-08-27 15:14:55 -07:00
markchien
f37b8ca988
[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: 98a30a1eec -s ours
...
am: e693a1fd0fdd32bb52f7
2019-08-27 14:56:28 -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
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: b5c8af70e8dd32bb52f7
2019-08-27 14:41:21 -07:00
markchien
e693a1fd0f
[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: 98a30a1eecdd32bb52f7
2019-08-27 13:52:50 -07:00
Android Build Merger (Role)
98a30a1eec
[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 dd32bb52f7 is in hi skipped: 3df1075c11
...
Change-Id: Iebd2f338e22cc0ba4683bf419528bab6544581f7
2019-08-27 20:37:19 +00:00
Android Build Merger (Role)
3df1075c11
[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 dd32bb52f7 is in hi skipped: db920e28f1
...
Change-Id: I33017ee7629e5c564d7e0ae2b52f4c2f72f1fe33
2019-08-27 20:37:14 +00:00
Android Build Merger (Role)
db920e28f1
[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 dd32bb52f7 is in hi skipped: ac8557efc7
...
Change-Id: Ib0dfc700b221cbc5c608c99c3fa544a07706dc87
2019-08-27 20:37:09 +00:00
markchien
ac8557efc7
[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
...
am: 63dda3513ddd32bb52f7
2019-08-27 13:36:46 -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
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: 2720cfb7ad52b82e3312
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
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: c34765400352b82e3312
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: 6df286c92fde0f268f78
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: ddb681cafe52b82e3312
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
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: 4f182df10a52b82e3312
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: 956b28af1352b82e3312
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
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: 5be8f14258de0f268f78
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
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: 8a4065394bdd32bb52f7
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
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: 17100fbdaadd32bb52f7
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
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: 4f182df10add32bb52f7
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
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: 335491989fdd32bb52f7
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
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: 335491989fd51ae5760d
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
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: 63dda3513dd51ae5760d
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
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
2019-08-24 02:42:37 -07:00
