Commit c6e6b176 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest"... 

[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a" into nougat-mr1-cts-dev am: ad4335d5 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 1cd060bc is in hi skipped: b942672e

Change-Id: Iebd2f338e22cc0ba4683bf419528bab6544581f7
parents 23ec3a7a b942672e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment