commit 718f123cfc46e448334efc91c69c8ab3d2367fe9
author markchien <markchien@google.com> Wed Aug 28 18:44:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 18:44:19 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent 7526bf0f92b21164d62fec2eb6e00d74415b0a1e
parent dad9c8a9802ca05dd4e2a0ca7faee71b82129898

Merge "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: 0cfcb1a472 -s ours am: ddbd12377c -s ours
am: dad9c8a980 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I3eef4d82eb1426061122ec3dba410e38ae37c349