tree 60b50af730840e023d111384dbcecad8987a17c4
parent b8e0be9df1ead83cfbf75f02ff5800b64fd75de4
parent caee99b3cf700f85a1aed57f3b232cd5135aa90c
author markchien <markchien@google.com> 1561651018 -0700
committer android-build-merger <android-build-merger@google.com> 1561651018 -0700

[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b am: 04118c8a30
am: caee99b3cf -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history

Change-Id: I216e490624ce14e2b4dacff9381a7d8c96276349