tree 09ea433fd7b81b4782633d7c107a96358647e312
parent 255af6675fafefcec78c26007f6338c83ba20d7d
parent 04118c8a30854accf27b6dcf32a66b478d6231b1
author markchien <markchien@google.com> 1561610267 -0700
committer android-build-merger <android-build-merger@google.com> 1561610267 -0700

Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b
am: 04118c8a30

Change-Id: Ic76572a2585a338f8c08b473455031ef25c562c1