tree 1f2e1f87243fe4c5a5cec3b1de558edee7c14a03
parent 6df286c92f0d5626cc003290307e57fb5f0d2a15
parent c34765400303a5ff55eb24418c68f2ced599b214
author markchien <markchien@google.com> 1566860414 -0700
committer android-build-merger <android-build-merger@google.com> 1566860414 -0700

Merge "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: 4f182df10a -s ours
am: c347654003 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I6cde06e3ea6337c00bca28792d0bedc94a529e35