| commit | 8a4065394b7f0d794a09466b373d2a0303221d9f | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 12:32:53 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 12:32:53 2019 -0700 |
| tree | a36ea02365bce399b385e2e9d7793eaf202735f9 | |
| parent | f78faad32a609baf08f52bdb3fa7efc3b1696152 [diff] | |
| parent | 4f182df10aa3e60dfe8efa0ef4ebb9edddcbe0ec [diff] |
Merge "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: 4f182df10a -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: I947f0790eb6b8c71d0efdaf73592567636c368c2