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: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am: 5458ce33b3 -s ours
am:fcf076d79b-s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1dd32bb52f7is in history Change-Id: I88a44349179fbaaef60a9bb2c8fd2f70bd7b8dea
This commit is contained in: