| commit | 95359b77a5870af27fc9fe64b08d9475ac80af18 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 15:38:36 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 15:38:36 2019 -0700 |
| tree | d70894cf3fe563b1e62154f42078e2fe2bcb16f5 | |
| parent | 7ff168c7a12f9dc928241e2cdc65e745d2ba2c80 [diff] | |
| parent | ddb681cafe8a89cceb97b8f740ae8a3eebe666c1 [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history Change-Id: Id91216812b8a1b43ac562a6cb7c450dc3db9a216