commit eb78c6b2804e68fcbbb0ac6b94e682b8049f316c
author markchien <markchien@google.com> Mon Aug 26 19:28:39 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 19:28:39 2019 -0700
tree 1d9a2b1975c4a1b295773752aa86438ae3f0e650
parent f54577397f2e9a3dc8bbfbbb44f3861657ed04be
parent 8aa093bac437a11e1d6364f0fde9547638b03f6e

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: f20182a83f -s ours
am: 8aa093bac4 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history

Change-Id: I33e47ace44ac2d3322f81e51951f34232ce67636