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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: Iae471ae678565978889a770433f769e5c8ae1292
This commit is contained in:
markchien
2019-08-26 14:55:41 -07:00
committed by android-build-merger

Diff Content Not Available