commit | 627c8a2edbdbb360e5ec4c0b74a8bbd35910917c | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Mon Aug 26 16:03:44 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 16:03:44 2019 -0700 |
tree | 1d9a2b1975c4a1b295773752aa86438ae3f0e650 | |
parent | 9ca5d6c481abce2122d883336d78774086c29f9c [diff] | |
parent | f37e3848c29009ab885f85d5312c83d4fa3c8b20 [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: f37e3848c2 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: If917cbb3b8f9ed30f67eb4d769dde8a09e8cf0d6