| commit | 6c5b96fc255a04a6de6f1db569e51fe6ce902ba5 | [log] [tgz] |
|---|---|---|
| author | markchien <markchien@google.com> | Mon Aug 26 13:49:56 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 26 13:49:56 2019 -0700 |
| tree | b252a1d2206d3e2a713644b98805a45f265ce103 | |
| parent | de6840b29267b57b11ef241ece98be6a0c44beb0 [diff] | |
| parent | ec58302ecef1366dd32db2ed18d030da016ffe3e [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: 8a4065394b -s ours am: 5be8f14258 -s ours am: ec58302ece -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history Change-Id: I68ad5fda9cfffba64ae994a5271db424dfe1fc48