Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am: c347654003 -s ours am: 2720cfb7ad -s ours am: 6705fff979 -s ours am: f20182a83f -s ours am: 8aa093bac4 -s ours
am:eb78c6b280-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1dd32bb52f7is in history Change-Id: I1e740acd43abdd9c8e5b735d3e87c7a26e60d794
This commit is contained in: