commit 231b935ea9cd7c687ad2a449375e6d104e270772
author markchien <markchien@google.com> Mon Aug 26 17:39:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 17:39:44 2019 -0700
tree b252a1d2206d3e2a713644b98805a45f265ce103
parent f37e3848c29009ab885f85d5312c83d4fa3c8b20
parent 6705fff9791d478c41dff37d9e5f525269aa2f1a

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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I7a9f4833c5728c10931b61da8cce57c7daf7b710