| commit | 6df286c92f0d5626cc003290307e57fb5f0d2a15 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 14:25:09 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 14:25:09 2019 -0700 |
| tree | 1f2e1f87243fe4c5a5cec3b1de558edee7c14a03 | |
| parent | 5a5fea23f9d0b9f2b058043a092e5be1a348501d [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: I3f3279a8747253ac763d0703075485c3153cda86