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: 9ca5d6c481 -s ours
am:1635d7c3cb-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1de0f268f78is in history Change-Id: Ib637c004b4013bb145f6da5810b2c521f0e8390c
This commit is contained in: