tree 4ca1b50e4c44e76c590b41a8515d7cc8d006a743
parent 8cdddd3d38a16dae15c54b692f1d554c03467ad7
parent 48516f991bc575294e019f28ae19469a09014c58
author markchien <markchien@google.com> 1566857306 -0700
committer android-build-merger <android-build-merger@google.com> 1566857306 -0700

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

Change-Id: Ideb9b92467b7a507ecd2908418b94a2cafd9a185