commit | f37e3848c29009ab885f85d5312c83d4fa3c8b20 | [log] [tgz] |
---|---|---|
author | markchien <markchien@google.com> | Mon Aug 26 15:10:32 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:10:32 2019 -0700 |
tree | b252a1d2206d3e2a713644b98805a45f265ce103 | |
parent | c59a2d1f73046d4e47ddc1fee8ff25d46c911a17 [diff] | |
parent | 48516f991bc575294e019f28ae19469a09014c58 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: I372c5885af2278f386376598f4a2494f0d021135