tree da5e3fde543585c67e77add1819e460771190b53
parent d93f6d545cc23a9a69672625b61032acfc992bdc
parent d51ae5760d7850d28911557e08e5110559d78bed
author markchien <markchien@google.com> 1561650657 -0700
committer android-build-merger <android-build-merger@google.com> 1561650657 -0700

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

Change-Id: Ia65a5ed54dd61a36d9f0f22fe2eae518c373230c