Commit 3cf580c3 authored by markchien's avatar markchien Committed by android-build-merger
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 history

Change-Id: I9be28d5c762c22e6c0b14a415a3d020450b443a6
parents 50b33fa6 ad4335d5
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