Commit 4be30d29 authored by markchien's avatar markchien Committed by android-build-merger
Browse files

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

Merge "[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: 89ef28e2 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 1cd060bc is in history

Change-Id: I6d31b4d1c94057cf0ad1904374841a71e2042f24
parents 53e1816b 89ef28e2
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