commit | 9ca5d6c481abce2122d883336d78774086c29f9c | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Mon Aug 26 15:22:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:22:19 2019 -0700 |
tree | 1d9a2b1975c4a1b295773752aa86438ae3f0e650 | |
parent | 9be4ff53f4082673b43f62221185c2c9e7b36f98 [diff] | |
parent | 1baab27e776c9a6b65370405c7e24d7e73616496 [diff] |
Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am: 6df286c92f -s ours am: 48516f991b -s ours am: 1baab27e77 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I89f6abefefd992e125a7caac013002b7ff94fc4c