commit 85af7064c4760d7edbc89f1ebe6a908d706e2b29
author markchien <markchien@google.com> Mon Aug 26 18:32:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 18:32:27 2019 -0700
tree 1d9a2b1975c4a1b295773752aa86438ae3f0e650
parent 1c234d4add750f10914eb31bd0c472330f6033ec
parent 231b935ea9cd7c687ad2a449375e6d104e270772

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: 2720cfb7ad -s ours am: 6705fff979 -s ours
am: 231b935ea9 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: Ib185040fd6dbdc9e6d0a91ad86a1c15bf4f1c1d9