tree b252a1d2206d3e2a713644b98805a45f265ce103
parent 7732ee5a3c4832480e1687f9483445553b41f08b
parent 7ff168c7a12f9dc928241e2cdc65e745d2ba2c80
author markchien <markchien@google.com> 1567025783 -0700
committer android-build-merger <android-build-merger@google.com> 1567025783 -0700

Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
am: 7ff168c7a1 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ibb2e82ee1d02bb22abe5a10b0e48c80bf7f047cf