| commit | 977970c113bd05d223f84d8ab40a6b1d8c41810f | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:07:31 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:07:31 2019 -0700 |
| tree | 21c453f788c0b38dfafcd9bf86bc01874778ad90 | |
| parent | 70c8804f62d0bb36a047017f29f3127070110311 [diff] | |
| parent | 89ef28e265f0d3541c913a985a66ea361a23d7d8 [diff] |
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: ad4335d5c5 -s ours am: 89ef28e265 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 e59803d27a is in history Change-Id: I99b533a6db29b6568b487cda80ba2f7fd5a1a6ac