tree b252a1d2206d3e2a713644b98805a45f265ce103
parent 8fe93b6bdabafd86ce009db6fe8a3f4726977221
parent 0cfcb1a47261f0aafd4451e510052a05039d5344
author markchien <markchien@google.com> 1567030241 -0700
committer android-build-merger <android-build-merger@google.com> 1567030241 -0700

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

Change-Id: I10deed57736172e6e54abcb032ad27b8caa0295b