LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,535 Commits 2 Branches 0 Tags
e9b9b8d2cab209c8ed625460a1bbdeb46fd636bd
Commit Graph

3535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
e9b9b8d2ca Merge "[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours am: 06f11f519f -s ours 
am: 42aea8fc99 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 86d07d0147 is in history

Change-Id: Ibb57d56600f0375aa6410e39c93a8272950e00cc
 2019-07-08 14:03:35 -07:00
Lorenzo Colitti
8a658e1d23 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours am: 4ec16da603 -s ours 
am: 11dd967d07 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: If6f9c699a009e8e3a874f65e2957a88b782864c2
 2019-07-08 13:59:54 -07:00
Android Build Merger (Role)
42aea8fc99 Merge "[automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours am: 06f11f519f -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history" into qt-r1-dev-plus-aosp 2019-07-08 20:50:03 +00:00
Lorenzo Colitti
58a64b6873 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours 
am: 06f11f519f -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I56f9a6cc1002bb293fbd041634c001f52d06d3ca
 2019-07-08 13:49:44 -07:00
Lorenzo Colitti
11dd967d07 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours am: 318b0296dd -s ours 
am: 4ec16da603 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I0a5f1172dd59c0d7126db630cac4735de7efa582
 2019-07-08 13:49:37 -07:00
Lorenzo Colitti
4ec16da603 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours 
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Idb010f117182360c116be8b1697e4b66d00c49f6
 2019-07-08 13:34:41 -07:00
Lorenzo Colitti
06f11f519f [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours 
am: 318b0296dd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ic1bd0bc8ca4972739af578e6e8f305a9fc111e63
 2019-07-08 13:34:39 -07:00
Lorenzo Colitti
318b0296dd [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours 
am: ac180af96d -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ieb4935ff494284c71dd7e7bc186076745a563606
 2019-07-08 13:22:39 -07:00
Lorenzo Colitti
ac180af96d [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours 
am: 6b43dd2a19 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I60f7d208ec780c241b674b78b656eec1781b768c
 2019-07-08 13:12:36 -07:00
Lorenzo Colitti
6b43dd2a19 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 am: d66e639f31 -s ours 
am: c37cc1e4f1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ie1bb4a36b1e572bfccf1c9e074835cbc1c9a464d
 2019-07-08 12:57:09 -07:00
Lorenzo Colitti
c37cc1e4f1 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 
am: d66e639f31 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I74cbd632b1a20501cfead409b87632adb1acc339
 2019-07-08 12:43:04 -07:00
Android Build Merger (Role)
d66e639f31 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 am: 7dc43d91c4 
Change-Id: I428b1ee7884c4177062279b5fb600c9fc239bee5
 2019-07-08 19:24:16 +00:00
Android Build Merger (Role)
7dc43d91c4 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 am: 5530604a47 
Change-Id: I9914b8be6955431a5f2340716d018d236f709dd1
 2019-07-08 19:24:10 +00:00
Android Build Merger (Role)
5530604a47 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3 
Change-Id: Ia7b615ad33acdcee358ceaa5a424e4bfff155998
 2019-07-08 19:24:06 +00:00
Android Build Merger (Role)
e386847db3 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 
Change-Id: If285f192d8078cd4934e6700b3b6a535185f1b53
 2019-07-08 19:23:59 +00:00
Android Build Merger (Role)
8e99f9ef76 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 
Change-Id: I03f5b6a01337158727e56ad60a79d9f2a87daf7e
 2019-07-08 19:23:55 +00:00
Android Build Merger (Role)
047d1a9ed5 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 
Change-Id: I0669f124ad6d84592053ac199c7fd1831fb8f7d3
 2019-07-08 19:23:50 +00:00
Android Build Merger (Role)
cbc0a6b066 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c 
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
 2019-07-08 19:23:45 +00:00
Lorenzo Colitti
e6ced2f716 Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev 
am: dd55552460

Change-Id: I6f2775a58f5c72effd7d04e031abb61df569dbb3
 2019-07-08 12:23:07 -07:00
Treehugger Robot
dd55552460 Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev 2019-07-08 18:39:08 +00:00
Junyu Lai
20187622cd [automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d am: 1eaa996e29 -s ours 
am: da507ff0df -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

Change-Id: I4a75fe6e5053387cb6cf3e6d8bea00056e3ade71
 2019-07-07 20:05:30 -07:00
Junyu Lai
da507ff0df [automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" am: f9b69119bf am: 44022a761d 
am: 1eaa996e29 -s ours
am skip reason: change_id Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6 with SHA1 5764173a9f is in history

Change-Id: Iad15c30ffb2ac954a9cfde98deaae73786ec61ce
 2019-07-07 19:56:33 -07:00
Junyu Lai
44022a761d Merge "Resolve resource ID at runtime to stabilize tests" 
am: f9b69119bf

Change-Id: I441a025af2263522fc4c14cb2fd17ccffe149819
 2019-07-07 19:39:29 -07:00
Junyu Lai
f9b69119bf Merge "Resolve resource ID at runtime to stabilize tests" 2019-07-08 02:05:08 +00:00
Junyu Lai
a57c0f01d4 Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev am: e5cca4e40e 
am: 0632e3aa67

Change-Id: I19a3d6008fae225ab3ba933cad5e2622c3861eb9
 2019-07-05 08:33:05 -07:00
Junyu Lai
0632e3aa67 Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev 
am: e5cca4e40e

Change-Id: Iffa441670cb2ab0b014cf26402d7a0fc040da31b
 2019-07-05 07:48:55 -07:00
junyulai
223fae9a7f Resolve resource ID at runtime to stabilize tests 
This change also remove some unused references.

Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest

Merged-In: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
(cherry-pick from ag/8500407)
 2019-07-05 15:28:17 +08:00
Junyu Lai
e5cca4e40e Merge "Resolve resource ID at runtime to stabilize tests" into qt-r1-dev 2019-07-05 07:24:16 +00:00
junyulai
5764173a9f Resolve resource ID at runtime to stabilize tests 
This change also remove some unused references.

Bug: 136638851
Test: atest android.net.cts.ConnectivityManagerTest

Change-Id: Ic44b31ed9acc48b9bcba7e1e70cc18a65bc0a8f6
 2019-07-05 10:29:04 +08:00
Lorenzo Colitti
86d07d0147 Fix expected reverse lookup of Google DNS IP addresses 
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.

Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5)
 2019-07-03 13:47:01 +09:00
Xin Li
f69f58136c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours am: 8e4484271a 
am: 3ad76b492c -s ours
am skip reason: subject contains skip directive

Change-Id: I43b266924593ea4c0ab47cba4645a805f9fb558e
 2019-07-02 12:48:27 -07:00
Xin Li
3ad76b492c [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours 
am: 8e4484271a

Change-Id: I71068fb89f31508e37a2534f04734140c045ff26
 2019-07-02 11:34:27 -07:00
Xin Li
734abbe367 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 
Bug: 134405016
Change-Id: I284a8e309f3a2ada92ffae93c26b0ef00ed72dac
 2019-07-01 20:58:37 +00:00
markchien
acedea85cf Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: b8b8d703d9 -s ours am: f090f3de05 -s ours am: 70808176ce -s ours am: 107b7aadfd -s ours 
am: f11c87d460 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I9189f29db749b171c19ecf2e8c68be8209205c9f
 2019-06-27 14:00:27 -07:00
markchien
db8e7becc3 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours am: 5ecbd991d5 -s ours am: cdef8b40ad -s ours am: 21830f0f86 -s ours am: b4673d4279 -s ours 
am: 1d1a939cda -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Ibbfcffacf8bb0bbb90bbb86e57120cf9ae4d49ff
 2019-06-27 13:51:10 -07:00
markchien
f11c87d460 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: b8b8d703d9 -s ours am: f090f3de05 -s ours am: 70808176ce -s ours 
am: 107b7aadfd -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I22a52c580b9507e2640c49a1091331babf184df4
 2019-06-27 10:57:31 -07:00
markchien
1d1a939cda [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours am: 5ecbd991d5 -s ours am: cdef8b40ad -s ours am: 21830f0f86 -s ours 
am: b4673d4279 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I0d3a7cd798275df5909736abffeb5213cbbc42b1
 2019-06-27 10:45:51 -07:00
markchien
107b7aadfd Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: b8b8d703d9 -s ours am: f090f3de05 -s ours 
am: 70808176ce -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I7c8d679fa0ac52ef4a75bbf74c725c76e6beab58
 2019-06-27 09:55:06 -07:00
markchien
b4673d4279 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours am: 5ecbd991d5 -s ours am: cdef8b40ad -s ours 
am: 21830f0f86 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I721587d2833fa81c099775175efb4a5f9d9510f4
 2019-06-27 09:36:58 -07:00
markchien
70808176ce Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: b8b8d703d9 -s ours 
am: f090f3de05 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I79f36a32d6415390ddfce6eacce3bffca3d7c11e
 2019-06-27 09:34:22 -07:00
markchien
f090f3de05 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours 
am: b8b8d703d9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ic9514c32f1e0c6e9565b114f98f02cb4c97d35b7
 2019-06-27 09:25:11 -07:00
markchien
21830f0f86 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours am: 5ecbd991d5 -s ours 
am: cdef8b40ad -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I3bd1878cdc5b94797309928d150deb1accb9059c
 2019-06-27 09:20:37 -07:00
markchien
b8b8d703d9 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 d51ae5760d is in history

Change-Id: I47ea61fd0bdc9c2b4fe080e29550b5fc0d2c1b38
 2019-06-27 09:14:58 -07:00
markchien
cdef8b40ad [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 am: caee99b3cf -s ours 
am: 5ecbd991d5 -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: I338e250514cd7b7c94d9eee24ce4ce738e000366
 2019-06-27 09:06:08 -07:00
markchien
5ecbd991d5 [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30 
am: caee99b3cf -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: I216e490624ce14e2b4dacff9381a7d8c96276349
 2019-06-27 08:56:58 -07:00
Android Merger
956b28af13 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history" into oreo-mr1-cts-dev 2019-06-27 15:51:06 +00:00
markchien
1547ce9dfa [automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev 
am: 0ff953bf1b -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: Ia65a5ed54dd61a36d9f0f22fe2eae518c373230c
 2019-06-27 08:50:57 -07:00
markchien
caee99b3cf Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b 
am: 04118c8a30

Change-Id: Ic76572a2585a338f8c08b473455031ef25c562c1
 2019-06-26 21:37:47 -07:00
markchien
04118c8a30 Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev 
am: 0ff953bf1b

Change-Id: I94e8de44713f076783073371cca65c4b5579220e
 2019-06-26 21:17:51 -07:00
Pete Bentley
e3185d0df0 Merge "Fix regression tests for SSLCertificateSocketFactoryTest hostname verification." am: 62ec101de4 am: 503cbe8f8c am: 465611b72f 
am: cf8f97b3b7

Change-Id: I3235d7b3bcbeef7d19e7fc1502ecf5e011b308f3
 2019-06-25 08:37:49 -07:00