Commit Graph

3672 Commits

Author SHA1 Message Date
Android Build Merger (Role)
ea7b26e8df Merge "[automerger skipped] [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f am: fc63596439 am: e5a066c347 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" into qt-qpr1-dev-plus-aosp 2019-08-28 01:46:55 +00:00
Chalard Jean
cfe68e98d2 [automerger skipped] [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f am: fc63596439
am: e5a066c347 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I7f51443866ceab017be0f839ed085427d41b05bd
2019-08-27 18:46:29 -07:00
markchien
29d52f8e3d [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: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: b9184953f6 -s ours
am: 74be0f2027 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ib8c205e19feb288cdc81daae9997d2e445f54781
2019-08-27 18:45:00 -07:00
Chalard Jean
25f9a876d7 Merge "[automerger skipped] [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f -s ours am: 51a055b74f -s ours
am: b25738004f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I50911ba282bf392fd97fb434274199c134162b5d
2019-08-27 18:35:06 -07:00
markchien
d360633930 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: 98a30a1eec -s ours am: e693a1fd0f -s ours am: f37b8ca988 -s ours am: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: 9ccbe8219b -s ours
am: 7047cf2117 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I45d5ef3ea5fb454ef1b8bf5c873872701d4adc6e
2019-08-27 18:33:54 -07:00
markchien
924f4ae7f3 [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: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours am: b9184953f6 -s ours
am: df838f627b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I8b23e2efb41c5a84f461a2cd568f542665a475ee
2019-08-27 18:24:15 -07:00
markchien
74be0f2027 [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: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: b9184953f6 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I9fc414222deda6e234b5dfd148036fdbfb653322
2019-08-27 18:19:46 -07:00
Chalard Jean
fc63596439 [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca
am: cfca80540f

Change-Id: I884b39bdaad5e5db330e5aa0c93a9d8b200e9321
2019-08-27 18:14:43 -07:00
markchien
b9184953f6 [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: 02ec1bfb0c -s ours
am: dd9de69fa9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I25d1ae42e9af624b6fad6cc4c05449af1a286d94
2019-08-27 18:13:37 -07:00
Chalard Jean
0bb467ab00 [automerger skipped] [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca am: cfca80540f -s ours
am: 51a055b74f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ic6a073e1ca1ef807a4d09bfc058a80e43981fa91
2019-08-27 18:12:26 -07:00
markchien
c5f02a7347 [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: 02ec1bfb0c -s ours am: dd9de69fa9 -s ours
am: 9ccbe8219b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I50b01dd298c9a2209c7de139dedb179496cc1a97
2019-08-27 18:11:22 -07:00
Chalard Jean
3fd7c3ad83 Merge "[automerger skipped] 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 am: 56909ca698 -s ours am: 935c961f67 -s ours
am: 90c5d8852c -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I2a6e08384c8f9b746933dd53c6f0726f28a76ea9
2019-08-27 17:22:57 -07:00
Chalard Jean
27845bfd4c [automerger skipped] 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 am: 56909ca698 am: 99ef3aff51 -s ours
am: 5442625a3b -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I1913ffb3eb6dc48704df9f9da2a3288712f1c6dc
2019-08-27 17:18:16 -07:00
markchien
76312c4b66 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours am: fcf076d79b -s ours
am: 27d1b797a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I2c4379777f88673569c8fb4eaf766d3986919ab8
2019-08-27 16:57:53 -07:00
markchien
2183ebd9bd 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours am: 55b6080424 -s ours
am: 0147e6e93b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I4a327775570da9efac8b3f1ae3c4407148b0ad7a
2019-08-27 16:55:35 -07:00
Chalard Jean
c79af070d2 [automerger skipped] 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 am: 56909ca698 am: 99ef3aff51
am: 1770913770 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I21ff4d2df39b8fcf7ddd27175f0dff11d068c9a6
2019-08-27 16:51:15 -07:00
markchien
8d32d41aa5 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours am: 55b6080424 -s ours
am: 05f41a0641 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Icc9cfc909fb4c7751285f78b0f1282bb89fecbe5
2019-08-27 16:49:07 -07:00
Chalard Jean
ab91e61512 [automerger skipped] 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 am: 56909ca698 -s ours
am: 935c961f67 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ibb8b1dad3477a8bbb69b394cface405edb6bb154
2019-08-27 16:26:17 -07:00
Chalard Jean
5442625a3b [automerger skipped] 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 am: 56909ca698
am: 99ef3aff51 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: Ic17ecd1e4d010d9a75ad85c218a15197113ef2e8
2019-08-27 16:23:57 -07:00
Chalard Jean
51a055b74f [automerger skipped] [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2 am: 2a1a1ca5ca
am: cfca80540f -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I8308f82891084e90db4ec17dd42b921f8e22c495
2019-08-27 16:23:51 -07:00
markchien
27d1b797a1 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours
am: fcf076d79b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I88a44349179fbaaef60a9bb2c8fd2f70bd7b8dea
2019-08-27 16:22:33 -07:00
markchien
0147e6e93b 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours
am: 55b6080424 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I0f142075b03f98507bf1711238f9ba79d5f2ae5e
2019-08-27 16:21:22 -07:00
markchien
9ccbe8219b [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: 02ec1bfb0c -s ours
am: dd9de69fa9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I52d883ff11b26ab95d8c068c74c1c93ef3cee0c6
2019-08-27 16:20:01 -07:00
Chalard Jean
cfca80540f [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b am: b8ab60bcc2
am: 2a1a1ca5ca

Change-Id: Ifec478eec43be30e8333a06596c4d118cc6abd96
2019-08-27 16:09:45 -07:00
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: 02ec1bfb0c -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ifef30bd7c1d7c96fbf18d000e0c87b96076fb412
2019-08-27 16:05:39 -07:00
Chalard Jean
99ef3aff51 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
am: 56909ca698

Change-Id: Ibe11dff54d645467fd8e829fa63e7942af87456b
2019-08-27 16:04:47 -07:00
markchien
55b6080424 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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours
am: 5458ce33b3 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Iff3ab439cd29848c148402d0860211035b3c8829
2019-08-27 16:02:42 -07:00
Chalard Jean
2a1a1ca5ca [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3 am: 503542058b
am: b8ab60bcc2

Change-Id: I661407671843f33c960fc9620583f232e4f424cd
2019-08-27 15:58:40 -07:00
Chalard Jean
935c961f67 [automerger skipped] 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
am: 56909ca698 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

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

Change-Id: I585441b58b6ee578b72181d29f913bb03a1f343b
2019-08-27 15:52:17 -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

Change-Id: I3af293a72c9361a756e3568e9d8457c8574cebfc
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: f37b8ca988 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Iae9c3a8dc7aaf52936b8078f043bc6488ec7d4a1
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: 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
b8ab60bcc2 [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887 am: 8ea6a7e0c3
am: 503542058b

Change-Id: Ia625bd5079359e8b0e5b5b5b98bdacef636c3b68
2019-08-27 15:20:03 -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
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: e693a1fd0f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I8efb6a710eb1925d725c4c8aeb61d5240b93a423
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

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
Chalard Jean
503542058b [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887
am: 8ea6a7e0c3

Change-Id: Icb1949443bc2b7844c9487584320a68b55d0c9a4
2019-08-27 13:55:28 -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: 98a30a1eec -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ia82cf1cd36f3f987d9dfd3740dd14ecd37ce1e46
2019-08-27 13:52:50 -07:00
Android Build Merger (Role)
8ea6a7e0c3 [automerger] 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 am: f515825b13 am: 0fc63b9a32 am: 44d2051887
Change-Id: I2a9b912de76d57a2122e38022becf46d0ab044cd
2019-08-27 20:40:52 +00:00
Android Build Merger (Role)
44d2051887 [automerger] 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 am: f515825b13 am: 0fc63b9a32
Change-Id: I928e0f5ca9200c0b989e5315758de706bf8d2bba
2019-08-27 20:40:48 +00:00
Android Build Merger (Role)
0fc63b9a32 [automerger] 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 am: f515825b13
Change-Id: I563f32e1d0f14c80a9dac8b3bf74d8fd80589f4d
2019-08-27 20:40:44 +00:00
Chalard Jean
f515825b13 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: Iea145d7c14cd6b8550ac509645843de5dec91173
2019-08-27 13:40:18 -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: 63dda3513d -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I9be28d5c762c22e6c0b14a415a3d020450b443a6
2019-08-27 13:36:46 -07:00
Chen Zhu
0e2c1d08c4 Merge "Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev am: be3a471e33 am: 29c264405f" into qt-r1-dev-plus-aosp
am: 6006f887bf

Change-Id: Ib45ab996e3d7e45a1e1f729a3815c55e24ced988
2019-08-26 22:15:50 -07:00