tree a36ea02365bce399b385e2e9d7793eaf202735f9
parent 175714a22734f63c94dc227fe4fdbdac6139e1b1
parent b5c8af70e8011a93dab05f4a4276e63981601e3f
author markchien <markchien@google.com> 1566942081 -0700
committer android-build-merger <android-build-merger@google.com> 1566942081 -0700

Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 17100fbdaa -s ours
am: b5c8af70e8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Ib42a9821da07d1c9ea48567ae37226ff9d329c30