Commit 52a78f16 authored by Mark Chien's avatar Mark Chien Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into nyc-mr2-dev 

* changes:
  [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a am: 9f64b30d am: e937072a am: f572e30a am: 3a8557a0
  [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a am: 9f64b30d am: e937072a am: f572e30a
  [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a am: 9f64b30d am: e937072a
  [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a am: 9f64b30d
  Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8a
parents 572d5972 b8ca3493
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