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: 27d1b797a1 -s ours

am: 76312c4b66 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ifec21164275b5d615932c07faeab5f040c6b086c
This commit is contained in:
markchien
2019-08-27 17:41:10 -07:00
committed by android-build-merger

Diff Content Not Available