commit 5af794bd455b2a9218211fe3aacfa4f18e834295
author markchien <markchien@google.com> Wed Aug 28 19:35:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 19:35:31 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent 781ab3fbdfa89186c344a0147c9fdecd120568dc
parent 718f123cfc46e448334efc91c69c8ab3d2367fe9

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: 718f123cfc -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: I627dde8b6b987ab571a0521a64b3960b473ea02d