commit 55b6080424dc84549ea4be5fa617792b9b8bceec
author markchien <markchien@google.com> Tue Aug 27 16:02:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 16:02:42 2019 -0700
tree fecd8bb4da6adc2dd6b6faa8328b06e938f5711e
parent ab9710f8373822a7d06fad5e0ede490a83569868
parent b0c9d6f327c4f3142996113de19b4d9cd0cd049c

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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: Iff3ab439cd29848c148402d0860211035b3c8829