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

3506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
markchien
dad9c8a980 Merge "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: 0cfcb1a472 -s ours 
am: ddbd12377c -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3ccc63a60e9fa465f391b1378b6b7be0c4749286
 2019-08-28 17:25:17 -07:00
markchien
ddbd12377c Merge "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: 0cfcb1a472 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b
 2019-08-28 15:10:41 -07:00
markchien
f2e8130635 Merge "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: ddce521efa -s ours 
am: 8fe93b6bda -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fad6af42f1e70e940729e6463e762cb197b6483
 2019-08-28 15:08:22 -07:00
markchien
10d149e4bc Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 7ff168c7a1 -s ours 
am: 07e500dd00 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Id67a80017c90ace63ff1846114eafcd1adb8d1c3
 2019-08-28 14:39:33 -07:00
markchien
8fe93b6bda Merge "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: ddce521efa -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I4fb6aa5ec81287040bba2c213a5f06024bd6eddf
 2019-08-28 14:24:50 -07:00
markchien
07e500dd00 Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours 
am: 7ff168c7a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf
 2019-08-28 13:56:23 -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
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
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
29c264405f Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev 
am: be3a471e33

Change-Id: Ie65788563c9a29c381ed3c7708c09aabe9c0d05b
 2019-08-26 21:58:35 -07:00
Chen Zhu
be3a471e33 Merge "Add CtsNetTestCases and CtsNativeNetDnsTestCases to MTS." into qt-dev 2019-08-27 04:38:13 +00:00
Sudheer Shanka
bf4ccb08a1 [automerger skipped] Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92" am: c497b007cb -s ours 
am: 7732ee5a3c -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: Id4b2045951326637bcdaa99f8ea070b649e15855
 2019-08-26 17:53:00 -07:00
Chalard Jean
c4a0d378e1 [automerger skipped] 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 
am: ad81a4ee9a -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history

Change-Id: I9b34983c7b0a0b8b0dd8175462a77296c1ed5ec4
 2019-08-26 17:41:31 -07:00
markchien
231b935ea9 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: 2720cfb7ad -s ours 
am: 6705fff979 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I7a9f4833c5728c10931b61da8cce57c7daf7b710
 2019-08-26 17:39:44 -07: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

Change-Id: Ia0277b972124e03db9424741e995261067f75de3
 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: 2720cfb7ad -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: If7724529b04189ff8271835457de48694bd8b780
 2019-08-26 16:56:45 -07:00
Sudheer Shanka
7732ee5a3c [automerger skipped] Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92" 
am: c497b007cb -s ours
am skip reason: change_id Ifec84425febf38d732367fae6b43fa80c427c79f with SHA1 802549c8de is in history

Change-Id: I00133d16a768a7fbcab7a24c2579d737a7e2dd3e
 2019-08-26 16:20:37 -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

Change-Id: Ia0f074c72325415ca7ebfa34d17b3affe6d625ac
 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: c347654003 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I6cde06e3ea6337c00bca28792d0bedc94a529e35
 2019-08-26 16:00:14 -07:00
Android Merger
0cfcb1a472 Merge "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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" 2019-08-26 22:51:54 +00:00
markchien
e6e8603ce4 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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I4ebcb8b4ab7ac188f4d467af54f6babd4f3682c5
 2019-08-26 15:51:47 -07:00
Android Merger
ddce521efa Merge "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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" 2019-08-26 22:38:50 +00:00
markchien
95359b77a5 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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Id91216812b8a1b43ac562a6cb7c450dc3db9a216
 2019-08-26 15:38:36 -07:00
Android Merger
7ff168c7a1 Merge "[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 de0f268f78 is in history" 2019-08-26 22:34:26 +00:00
markchien
71a8c22e67 [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 de0f268f78 is in history

Change-Id: Ice656a5071de57fc10f98192ffd11bea2ca4668f
 2019-08-26 15:34:18 -07:00
Android Merger
c497b007cb Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92" 2019-08-26 22:17:00 +00:00
Sudheer Shanka
981f30d9ea Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev 
am: e3c9363b92

Change-Id: I692bc3cae382dee7a0215871d3da658c87d45a5e
 2019-08-26 15:16:49 -07:00