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
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
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
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
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
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
2019-08-23 20:31:47 -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
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
2019-08-23 09:49:42 +00: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
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
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
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
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
Chalard Jean
8ce68f1310
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 b5e98a971a73693740a784e8bd355df41df6faa2)
Change-Id: I329c06395d63500ff20c77cee670566d83c3ac8a
2019-08-20 10:13:50 +00:00
markchien
257e3faca3
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev
...
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d
2019-08-16 10:29:51 -07:00
markchien
52b82e3312
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78
2019-08-09 12:45:45 +00:00
Mark Chien
e6bf3b799e
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours
...
am: 9b319aa0efd51ae5760d
2019-07-31 20:46:59 -07:00
Mark Chien
9b319aa0ef
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours
...
am: ecaabe8f3ed51ae5760d
2019-07-31 20:34:15 -07:00
