| commit | f54577397f2e9a3dc8bbfbbb44f3861657ed04be | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 17:28:32 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 17:28:32 2019 -0700 |
| tree | 1d9a2b1975c4a1b295773752aa86438ae3f0e650 | |
| parent | 1635d7c3cb5ae3be1f84d2f60a48e748e33bbafb [diff] | |
| parent | 627c8a2edbdbb360e5ec4c0b74a8bbd35910917c [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: 627c8a2edb -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history Change-Id: I73c106f3a65319f3f27052f00bf2d7f473ca423c