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

Change-Id: Ic3d335a460831f006fbb247e01a8b430c101514d
This commit is contained in:
markchien
2019-08-26 17:22:00 -07:00
committed by android-build-merger

Diff Content Not Available