markchien
1635d7c3cb
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: 48516f991b -s ours am: 1baab27e77 -s ours
...
am: 9ca5d6c481d51ae5760d
2019-08-26 17:22:00 -07:00
Chalard Jean
7a15e135bd
[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 am: 8cdddd3d38 -s ours
...
am: 9be4ff53f4aa76b34ae8
2019-08-26 15:59:25 -07:00
markchien
42c4f98219
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: 9d6bb2d8c1 -s ours
...
am: acec5e43cf52b82e3312
2019-08-26 15:57:26 -07:00
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: 57a5075fd0aa76b34ae8
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
2019-08-26 15:53:04 -07:00
markchien
9ca5d6c481
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: 48516f991b -s ours
...
am: 1baab27e7752b82e3312
2019-08-26 15:22:19 -07:00
markchien
1baab27e77
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: 48516f991b52b82e3312
2019-08-26 15:08:26 -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
Chalard Jean
9be4ff53f4
[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
...
am: 8cdddd3d38aa76b34ae8
2019-08-26 14:16:46 -07:00
Android Build Merger (Role)
acec5e43cf
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: 9d6bb2d8c1 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history" into qt-r1-dev-plus-aosp
2019-08-26 21:14:49 +00:00
markchien
4839867519
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: 9d6bb2d8c1de0f268f78
2019-08-26 14:14:24 -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: c59a2d1f73aa76b34ae8
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: 6c5b96fc25de0f268f78
2019-08-26 14:11:44 -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
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: 3a3e17ec6caa76b34ae8
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: 7c64b55ee7aa76b34ae8
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: 0da6b47eb4aa76b34ae8
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: ec58302ecede0f268f78
2019-08-26 13:49:56 -07:00
Chalard Jean
8cdddd3d38
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
2019-08-26 13:49:06 -07:00
markchien
9d6bb2d8c1
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: ec58302ecede0f268f78
2019-08-26 13:47: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
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
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
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
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: de6840b292aa76b34ae8
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: 1c57f17275aa76b34ae8
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
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: a9522fcc78aa76b34ae8
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
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
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
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
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
2019-08-23 21:18:31 -07:00
