| commit | b0c9d6f327c4f3142996113de19b4d9cd0cd049c | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 15:27:57 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 15:27:57 2019 -0700 |
| tree | 5da4ea38afabf978480464652d75b93cc7a41c29 | |
| parent | be3a471e33e1e410fba252063d2874417371a491 [diff] | |
| parent | 4f12dd079bb0198dbfc38868d566bf1d492c9833 [diff] |
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 17100fbdaa -s ours am: b5c8af70e8 -s ours am: d2a3794666 -s ours am: 4f12dd079b -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: Ic565bd5584a07a8a7f3b23c20d47210f9afa7df1