commit 2183ebd9bd3e88aa60cc899821b051e8c0b9a5b0
author markchien <markchien@google.com> Tue Aug 27 16:55:35 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Aug 27 16:55:35 2019 -0700
tree 46b2bce636a4cb7fb5747847fed40eefccba5169
parent c79af070d27a715514151eb168aa19697b90eca3
parent 0147e6e93bd365ebc79c816163c9f5fc7a5aa52b

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: 55b6080424 -s ours
am: 0147e6e93b -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I4a327775570da9efac8b3f1ae3c4407148b0ad7a