tree 878bec7911ca38ca7e62b91ac6f57724e0a3ef9d
parent 8f5db6ef7185cf642265147d02595033c8337131
parent db920e28f13ad24af09edf07729926c82776bf7f
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1566938234 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1566938234 +0000

[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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in hi skipped: db920e28f1

Change-Id: I33017ee7629e5c564d7e0ae2b52f4c2f72f1fe33