| commit | 4f12dd079bb0198dbfc38868d566bf1d492c9833 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Tue Aug 27 15:14:55 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 15:14:55 2019 -0700 |
| tree | 1f2e1f87243fe4c5a5cec3b1de558edee7c14a03 | |
| parent | f6fe877aff00c05ec3d65892d0779602f26a5fe6 [diff] | |
| parent | d2a379466694c58badd8cb6adc8cf50d3081821f [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 skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history Change-Id: I9650cc3a37ba2f78d2dd5cf8923c8407f2f4a073