commit a0343dc97fe268c8c152a896cc51136a52a63021
author markchien <markchien@google.com> Tue Aug 27 17:41:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 17:41:10 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent 85787db7191f865edcac4675515fb7238c2bccdc
parent 76312c4b66269a454890d139c74f431a4ce0e305

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: fcf076d79b -s ours am: 27d1b797a1 -s ours
am: 76312c4b66 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history

Change-Id: Ifec21164275b5d615932c07faeab5f040c6b086c