tree 241322ceab9b8eccbe61c853629ef8ad1a0febc0
parent cdef8b40ad48ff66744298d5fdcbe33ee7afe00f
parent b8b8d703d9981d107f2ced5af18cf598733a47f2
author markchien <markchien@google.com> 1561652711 -0700
committer android-build-merger <android-build-merger@google.com> 1561652711 -0700

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

Change-Id: Ic9514c32f1e0c6e9565b114f98f02cb4c97d35b7