| commit | 48516f991bc575294e019f28ae19469a09014c58 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 14:55:41 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 14:55:41 2019 -0700 |
| tree | cadfe1854e40d4818933ad49ca62a6fbaa3ab285 | |
| parent | 7c64b55ee784be0d662da40e874479cb161ada77 [diff] | |
| parent | 6df286c92f0d5626cc003290307e57fb5f0d2a15 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: Iae471ae678565978889a770433f769e5c8ae1292