Commit 977970c1 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 e59803d2 is in history

Change-Id: I99b533a6db29b6568b487cda80ba2f7fd5a1a6ac
parents 70c8804f 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